Skip to content

Commit 42d3f77

Browse files
pytkinpytkin
committed
Update navbar-height and input-font-size variables in navbar.less
1 parent ee886c4 commit 42d3f77

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

‎css/flat-ui.css

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
@font-face {
22
font-family: 'Lato';
3-
src: url('../fonts/lato/lato-black-webfont.eot');
4-
src: url('../fonts/lato/lato-black-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-black-webfont.woff') format('woff'), url('../fonts/lato/lato-black-webfont.ttf') format('truetype'), url('../fonts/lato/lato-black-webfont.svg#latoblack') format('svg');
3+
src: url('../fonts/lato/lato-black.eot');
4+
src: url('../fonts/lato/lato-black.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-black.woff') format('woff'), url('../fonts/lato/lato-black.ttf') format('truetype'), url('../fonts/lato/lato-black.svg#latoblack') format('svg');
55
font-weight: 900;
66
font-style: normal;
77
}
88
@font-face {
99
font-family: 'Lato';
10-
src: url('../fonts/lato/lato-bold-webfont.eot');
11-
src: url('../fonts/lato/lato-bold-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-bold-webfont.woff') format('woff'), url('../fonts/lato/lato-bold-webfont.ttf') format('truetype'), url('../fonts/lato/lato-bold-webfont.svg#latobold') format('svg');
10+
src: url('../fonts/lato/lato-bold.eot');
11+
src: url('../fonts/lato/lato-bold.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-bold.woff') format('woff'), url('../fonts/lato/lato-bold.ttf') format('truetype'), url('../fonts/lato/lato-bold.svg#latobold') format('svg');
1212
font-weight: bold;
1313
font-style: normal;
1414
}
1515
@font-face {
1616
font-family: 'Lato';
17-
src: url('../fonts/lato/lato-bolditalic-webfont.eot');
18-
src: url('../fonts/lato/lato-bolditalic-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-bolditalic-webfont.woff') format('woff'), url('../fonts/lato/lato-bolditalic-webfont.ttf') format('truetype'), url('../fonts/lato/lato-bolditalic-webfont.svg#latobold_italic') format('svg');
17+
src: url('../fonts/lato/lato-bolditalic.eot');
18+
src: url('../fonts/lato/lato-bolditalic.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-bolditalic.woff') format('woff'), url('../fonts/lato/lato-bolditalic.ttf') format('truetype'), url('../fonts/lato/lato-bolditalic.svg#latobold-italic') format('svg');
1919
font-weight: bold;
2020
font-style: italic;
2121
}
2222
@font-face {
2323
font-family: 'Lato';
24-
src: url('../fonts/lato/lato-italic-webfont.eot');
25-
src: url('../fonts/lato/lato-italic-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-italic-webfont.woff') format('woff'), url('../fonts/lato/lato-italic-webfont.ttf') format('truetype'), url('../fonts/lato/lato-italic-webfont.svg#latoitalic') format('svg');
24+
src: url('../fonts/lato/lato-italic.eot');
25+
src: url('../fonts/lato/lato-italic.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-italic.woff') format('woff'), url('../fonts/lato/lato-italic.ttf') format('truetype'), url('../fonts/lato/lato-italic.svg#latoitalic') format('svg');
2626
font-weight: normal;
2727
font-style: italic;
2828
}
2929
@font-face {
3030
font-family: 'Lato';
31-
src: url('../fonts/lato/lato-light-webfont.eot');
32-
src: url('../fonts/lato/lato-light-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-light-webfont.woff') format('woff'), url('../fonts/lato/lato-light-webfont.ttf') format('truetype'), url('../fonts/lato/lato-light-webfont.svg#latolight') format('svg');
31+
src: url('../fonts/lato/lato-light.eot');
32+
src: url('../fonts/lato/lato-light.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-light.woff') format('woff'), url('../fonts/lato/lato-light.ttf') format('truetype'), url('../fonts/lato/lato-light.svg#latolight') format('svg');
3333
font-weight: 300;
3434
font-style: normal;
3535
}
3636
@font-face {
3737
font-family: 'Lato';
38-
src: url('../fonts/lato/lato-regular-webfont.eot');
39-
src: url('../fonts/lato/lato-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-regular-webfont.woff') format('woff'), url('../fonts/lato/lato-regular-webfont.ttf') format('truetype'), url('../fonts/lato/lato-regular-webfont.svg#latoregular') format('svg');
38+
src: url('../fonts/lato/lato-regular.eot');
39+
src: url('../fonts/lato/lato-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/lato/lato-regular.woff') format('woff'), url('../fonts/lato/lato-regular.ttf') format('truetype'), url('../fonts/lato/lato-regular.svg#latoregular') format('svg');
4040
font-weight: normal;
4141
font-style: normal;
4242
}
4343
@font-face {
44-
font-family: 'Flat-UI-Icons';
45-
src: url('../fonts/Flat-UI-Icons.eot');
46-
src: url('../fonts/Flat-UI-Icons.eot?#iefix') format('embedded-opentype'), url('../fonts/Flat-UI-Icons.woff') format('woff'), url('../fonts/Flat-UI-Icons.ttf') format('truetype'), url('../fonts/Flat-UI-Icons.svg#Flat-UI-Icons') format('svg');
44+
font-family: "Flat-UI-Icons";
45+
src: url('../fonts/flat-ui-icons-regular.eot');
46+
src: url('../fonts/flat-ui-icons-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/flat-ui-icons-regular.woff') format('woff'), url('../fonts/flat-ui-icons-regular.ttf') format('truetype'), url('../fonts/flat-ui-icons-regular.svg#flat-ui-icons-regular') format('svg');
4747
font-weight: normal;
4848
font-style: normal;
4949
}
@@ -56,6 +56,7 @@
5656
font-variant: normal;
5757
text-transform: none;
5858
-webkit-font-smoothing: antialiased;
59+
-moz-osx-font-smoothing: grayscale;
5960
}
6061
/* Use the following CSS code if you want to have a class per icon */
6162
/*
@@ -101,6 +102,7 @@ you can use the generic selector below, but it's slower:
101102
font-variant: normal;
102103
text-transform: none;
103104
-webkit-font-smoothing: antialiased;
105+
-moz-osx-font-smoothing: grayscale;
104106
}
105107
.fui-arrow-right:before {
106108
content: "\e02c";
@@ -295,7 +297,7 @@ h6,
295297
.h4,
296298
.h5,
297299
.h6 {
298-
font-family: "Lato", Helvetica, Arial, sans-serif;
300+
font-family: inherit;
299301
font-weight: 700;
300302
line-height: 1.1;
301303
color: inherit;

‎less/modules/navbar.less

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
// our navbars.
225225

226226
.navbar-input {
227-
.input-size(@input-height-small; 5px; 10px; @input-font-size-sm; @navbar-input-line-height);
227+
.input-size(@input-height-small; 5px; 10px; @input-font-size-small; @navbar-input-line-height);
228228
}
229229

230230
.navbar-form {
@@ -787,7 +787,7 @@
787787

788788
// Large navbar
789789
.navbar-lg {
790-
min-height: @navbar-height-lg;
790+
min-height: @navbar-height-large;
791791

792792
.navbar-brand {
793793
line-height: 1;
@@ -813,8 +813,8 @@
813813
}
814814

815815
.navbar-toggle {
816-
height: @navbar-height-lg;
817-
line-height: @navbar-height-lg;
816+
height: @navbar-height-large;
817+
line-height: @navbar-height-large;
818818
}
819819

820820
.navbar-unread,
@@ -823,11 +823,11 @@
823823
}
824824

825825
.navbar-form {
826-
.navbar-vertical-align(@input-height-small; @navbar-height-lg);
826+
.navbar-vertical-align(@input-height-small; @navbar-height-large);
827827
}
828828

829829
.navbar-text {
830-
.navbar-vertical-align(23px; @navbar-height-lg);
830+
.navbar-vertical-align(23px; @navbar-height-large);
831831
}
832832

833833
.navbar-btn {

0 commit comments

Comments
 (0)