Skip to content

Commit 13fa123

Browse files
author
FezVrasta
committed
1 parent 8cc954a commit 13fa123

9 files changed

Lines changed: 283 additions & 69 deletions

File tree

css-compiled/material-wfont.css

Lines changed: 232 additions & 49 deletions
Large diffs are not rendered by default.

css-compiled/material-wfont.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css-compiled/material.css

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1975,13 +1975,8 @@ legend {
19751975
color: #e5e5e5;
19761976
background-color: transparent;
19771977
}
1978-
.navbar-toggle {
1978+
.navbar .navbar-toggle {
19791979
margin-top: 13px;
1980-
}
1981-
.navbar-default .navbar-toggle {
1982-
border-color: transparent;
1983-
}
1984-
.navbar-inverse .navbar-toggle {
19851980
border-color: transparent;
19861981
}
19871982
.navbar .navbar-toggle:hover,
@@ -1991,6 +1986,10 @@ legend {
19911986
.navbar .navbar-toggle .icon-bar {
19921987
background-color: rgba(255, 255, 255, 0.84);
19931988
}
1989+
.navbar .navbar-default .navbar-toggle,
1990+
.navbar .navbar-inverse .navbar-toggle {
1991+
border-color: transparent;
1992+
}
19941993
.navbar .navbar-collapse,
19951994
.navbar .navbar-form {
19961995
border-color: rgba(0, 0, 0, 0.1);
@@ -2180,6 +2179,19 @@ fieldset[disabled] .navbar .btn-link:focus {
21802179
background-color: rgba(0, 0, 0, 0.05);
21812180
color: rgba(0, 0, 0, 0.84);
21822181
}
2182+
@media (max-width: 1199px) {
2183+
.navbar .navbar-brand {
2184+
height: 50px;
2185+
padding: 10px 15px;
2186+
}
2187+
.navbar .navbar-form {
2188+
margin-top: 10px;
2189+
}
2190+
.navbar .navbar-nav > li > a {
2191+
padding-top: 15px;
2192+
padding-bottom: 15px;
2193+
}
2194+
}
21832195
.dropdown-menu {
21842196
border: 0;
21852197
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26);

css-compiled/material.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css-compiled/ripples.css

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,22 @@
1919
margin-top: -10px;
2020
border-radius: 100%;
2121
background-color: rgba(0, 0, 0, 0.05);
22-
transform: scale(1);
23-
transform-origin: 50%;
22+
-webkit-transform: scale(1);
23+
-ms-transform: scale(1);
24+
transform: scale(1);
25+
-webkit-transform-origin: 50%;
26+
-ms-transform-origin: 50%;
27+
transform-origin: 50%;
2428
opacity: 0;
2529
pointer-events: none;
2630
}
2731
.ripple.ripple-on {
28-
transition: opacity 0.15s ease-in 0s, transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
32+
-webkit-transition: opacity 0.15s ease-in 0s, -webkit-transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
33+
transition: opacity 0.15s ease-in 0s, transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
2934
opacity: 1;
3035
}
3136
.ripple.ripple-out {
32-
transition: opacity 0.1s linear 0s !important;
37+
-webkit-transition: opacity 0.1s linear 0s !important;
38+
transition: opacity 0.1s linear 0s !important;
3339
opacity: 0;
3440
}

less/inputs.less

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ select.form-control {
180180
}
181181

182182

183-
.keyframe-input-highlight() {
183+
@keyframes input-highlight {
184184
0% {
185185
left: 20%;
186186
transform: scaleX(20%);
@@ -195,9 +195,6 @@ select.form-control {
195195
}
196196
}
197197

198-
@keyframes input-highlight {.keyframe-input-highlight()}
199-
200-
201198
// Input files (kinda hack)
202199
.form-control-wrapper input[type=file] {
203200
opacity: 0;

less/navbar.less

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
.navbar-text {
2121
color: @navbar-color;
22-
margin-top: 20px;
23-
margin-bottom: 20px;
22+
margin-top: 20px;
23+
margin-bottom: 20px;
2424
}
2525

2626
.navbar-nav {
@@ -211,4 +211,20 @@
211211

212212
}
213213
}
214+
215+
@media (max-width: 1199px) {
216+
217+
.navbar-brand {
218+
height: 50px;
219+
padding: 10px 15px;
220+
}
221+
.navbar-form {
222+
margin-top: 10px;
223+
}
224+
225+
.navbar-nav > li > a {
226+
padding-top: 15px;
227+
padding-bottom: 15px;
228+
}
229+
}
214230
}

template/material/css-compiled/material-wfont.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

template/material/css-compiled/material.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)