font changes

vm-labs · Apr 9, 2015 · 7ab9cf1 · 7ab9cf1
1 parent f89e111
commit 7ab9cf1
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 54 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-he",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "homepage": "https://github.com/vm-labs/bootstrap-he",
   "authors": [
     "Kristiyan Hristov"

diff --git a/config.json b/config.json
@@ -22,7 +22,7 @@
     "@font-family-base": "@font-family-sans-serif",
     "@font-size-base": "14px",
     "@font-size-large": "ceil((@font-size-base * 1.25))",
-    "@font-size-small": "ceil((@font-size-base * 0.85))",
+    "@font-size-small": "13px",
     "@font-size-h1": "36px",
     "@font-size-h2": "24px",
     "@font-size-h3": "18px",
@@ -249,7 +249,7 @@
     "@label-danger-bg": "@brand-danger",
     "@label-color": "#fff",
     "@label-link-hover-color": "#fff",
-    "@modal-inner-padding": "20px",
+    "@modal-inner-padding": "60px 20px 50px",
     "@modal-title-padding": "20px",
     "@modal-title-line-height": "@line-height-base",
     "@modal-content-bg": "#fff",
@@ -355,8 +355,8 @@
     "@carousel-indicator-border-color": "#fff",
     "@carousel-caption-color": "#fff",
     "@close-font-weight": "bold",
-    "@close-color": "#000",
-    "@close-text-shadow": "0 1px 0 #fff",
+    "@close-color": "#fff",
+    "@close-text-shadow": "none",
     "@code-color": "#c7254e",
     "@code-bg": "#f9f2f4",
     "@kbd-color": "#fff",
@@ -426,5 +426,5 @@
     "scrollspy.js",
     "transition.js"
   ],
-  "customizerUrl": "http://getbootstrap.com/customize/?id=0a9bd1867b0156752713"
+  "customizerUrl": "http://getbootstrap.com/customize/?id=23117cf2be7f5125c15a"
 }
diff --git a/dist/css/bootstrap-theme.css b/dist/css/bootstrap-theme.css
@@ -5,8 +5,8 @@
  */
 
 /*!
- * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=0a9bd1867b0156752713)
- * Config saved to config.json and https://gist.github.com/0a9bd1867b0156752713
+ * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=23117cf2be7f5125c15a)
+ * Config saved to config.json and https://gist.github.com/23117cf2be7f5125c15a
  */
 .btn-default,
 .btn-primary,

diff --git a/dist/css/bootstrap-theme.min.css b/dist/css/bootstrap-theme.min.css
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
@@ -5,8 +5,8 @@
  */
 
 /*!
- * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=0a9bd1867b0156752713)
- * Config saved to config.json and https://gist.github.com/0a9bd1867b0156752713
+ * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=23117cf2be7f5125c15a)
+ * Config saved to config.json and https://gist.github.com/23117cf2be7f5125c15a
  */
 /*! normalize.css v3.0.2 | MIT License | git.io/normalize */
 html {
@@ -1307,7 +1307,7 @@ p {
 }
 small,
 .small {
-  font-size: 85%;
+  font-size: 92%;
 }
 mark,
 .mark {
@@ -2607,7 +2607,7 @@ input[type="search"] {
   .input-group-sm input[type="time"],
   .input-group-sm input[type="datetime-local"],
   .input-group-sm input[type="month"] {
-    line-height: 30px;
+    line-height: 31px;
   }
   input[type="date"].input-lg,
   input[type="time"].input-lg,
@@ -2697,41 +2697,41 @@ fieldset[disabled] .checkbox label {
   padding-right: 0;
 }
 .input-sm {
-  height: 30px;
+  height: 31px;
   padding: 5px 10px;
-  font-size: 12px;
+  font-size: 13px;
   line-height: 1.5;
   border-radius: 3px;
 }
 select.input-sm {
-  height: 30px;
-  line-height: 30px;
+  height: 31px;
+  line-height: 31px;
 }
 textarea.input-sm,
 select[multiple].input-sm {
   height: auto;
 }
 .form-group-sm .form-control {
-  height: 30px;
+  height: 31px;
   padding: 5px 10px;
-  font-size: 12px;
+  font-size: 13px;
   line-height: 1.5;
   border-radius: 3px;
 }
 select.form-group-sm .form-control {
-  height: 30px;
-  line-height: 30px;
+  height: 31px;
+  line-height: 31px;
 }
 textarea.form-group-sm .form-control,
 select[multiple].form-group-sm .form-control {
   height: auto;
 }
 .form-group-sm .form-control-static {
-  height: 30px;
+  height: 31px;
   padding: 5px 10px;
-  font-size: 12px;
+  font-size: 13px;
   line-height: 1.5;
-  min-height: 32px;
+  min-height: 33px;
 }
 .input-lg {
   height: 46px;
@@ -2794,9 +2794,9 @@ select[multiple].form-group-lg .form-control {
   line-height: 46px;
 }
 .input-sm + .form-control-feedback {
-  width: 30px;
-  height: 30px;
-  line-height: 30px;
+  width: 31px;
+  height: 31px;
+  line-height: 31px;
 }
 .has-success .help-block,
 .has-success .control-label,
@@ -3353,14 +3353,14 @@ fieldset[disabled] .btn-link:focus {
 .btn-sm,
 .btn-group-sm > .btn {
   padding: 5px 10px;
-  font-size: 12px;
+  font-size: 13px;
   line-height: 1.5;
   border-radius: 3px;
 }
 .btn-xs,
 .btn-group-xs > .btn {
   padding: 1px 5px;
-  font-size: 12px;
+  font-size: 13px;
   line-height: 1.5;
   border-radius: 3px;
 }
@@ -3513,7 +3513,7 @@ tbody.collapse.in {
 .dropdown-header {
   display: block;
   padding: 3px 20px;
-  font-size: 12px;
+  font-size: 13px;
   line-height: 1.42857143;
   color: #777777;
   white-space: nowrap;
@@ -3763,17 +3763,17 @@ select[multiple].input-group-lg > .input-group-btn > .btn {
 .input-group-sm > .form-control,
 .input-group-sm > .input-group-addon,
 .input-group-sm > .input-group-btn > .btn {
-  height: 30px;
+  height: 31px;
   padding: 5px 10px;
-  font-size: 12px;
+  font-size: 13px;
   line-height: 1.5;
   border-radius: 3px;
 }
 select.input-group-sm > .form-control,
 select.input-group-sm > .input-group-addon,
 select.input-group-sm > .input-group-btn > .btn {
-  height: 30px;
-  line-height: 30px;
+  height: 31px;
+  line-height: 31px;
 }
 textarea.input-group-sm > .form-control,
 textarea.input-group-sm > .input-group-addon,
@@ -3812,7 +3812,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 }
 .input-group-addon.input-sm {
   padding: 5px 10px;
-  font-size: 12px;
+  font-size: 13px;
   border-radius: 3px;
 }
 .input-group-addon.input-lg {
@@ -4365,8 +4365,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
   margin-bottom: 13px;
 }
 .navbar-btn.btn-sm {
-  margin-top: 15px;
-  margin-bottom: 15px;
+  margin-top: 14.5px;
+  margin-bottom: 14.5px;
 }
 .navbar-btn.btn-xs {
   margin-top: 19px;
@@ -4692,7 +4692,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
 .pagination-sm > li > a,
 .pagination-sm > li > span {
   padding: 5px 10px;
-  font-size: 12px;
+  font-size: 13px;
 }
 .pagination-sm > li:first-child > a,
 .pagination-sm > li:first-child > span {
@@ -4813,7 +4813,7 @@ a.label:focus {
   display: inline-block;
   min-width: 10px;
   padding: 3px 7px;
-  font-size: 12px;
+  font-size: 13px;
   font-weight: 600;
   color: #ffffff;
   line-height: 1;
@@ -5032,7 +5032,7 @@ a.thumbnail.active {
   float: left;
   width: 0%;
   height: 100%;
-  font-size: 12px;
+  font-size: 13px;
   line-height: 20px;
   color: #ffffff;
   text-align: center;
@@ -5696,14 +5696,14 @@ a.list-group-item-danger.active:focus {
   font-size: 21px;
   font-weight: bold;
   line-height: 1;
-  color: #000000;
-  text-shadow: 0 1px 0 #ffffff;
+  color: #ffffff;
+  text-shadow: none;
   opacity: 0.2;
   filter: alpha(opacity=20);
 }
 .close:hover,
 .close:focus {
-  color: #000000;
+  color: #ffffff;
   text-decoration: none;
   cursor: pointer;
   opacity: 0.5;
@@ -5798,10 +5798,10 @@ button.close {
 }
 .modal-body {
   position: relative;
-  padding: 20px;
+  padding: 60px 20px 50px;
 }
 .modal-footer {
-  padding: 20px;
+  padding: 60px 20px 50px;
   text-align: right;
   border-top: 1px solid #e5e5e5;
 }
@@ -5845,7 +5845,7 @@ button.close {
   z-index: 1070;
   display: block;
   font-family: 'Open SaontAwesome, sans-serns', Fif;
-  font-size: 12px;
+  font-size: 13px;
   font-weight: normal;
   line-height: 1.4;
   opacity: 0;

diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
@@ -5,8 +5,8 @@
  */
 
 /*!
- * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=0a9bd1867b0156752713)
- * Config saved to config.json and https://gist.github.com/0a9bd1867b0156752713
+ * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=23117cf2be7f5125c15a)
+ * Config saved to config.json and https://gist.github.com/23117cf2be7f5125c15a
  */
 if (typeof jQuery === 'undefined') {
   throw new Error('Bootstrap\'s JavaScript requires jQuery')

diff --git a/dist/js/bootstrap.min.js b/dist/js/bootstrap.min.js