Skip to content

Commit 17f3a36

Browse files
committed
Merge pull request #394 from chester1000/higher-width
fix(bootstrap): removed styles breaking responsiveness for high-res screens
2 parents faf9f07 + 58aa7a4 commit 17f3a36

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

app/templates/client/app/app(css).css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
color: #000;
3838
padding: 0.2em 0;
3939
}
40-
40+
<% if (!filters.bootstrap) { %>
4141
/* Responsive: Portrait tablets and up */
4242
@media screen and (min-width: 768px) {
4343
.container {
4444
max-width: 730px;
4545
}
46-
}
46+
}<% } %>

app/templates/client/app/app(less).less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
color: #000;
1515
padding: 0.2em 0;
1616
}
17-
17+
<% if (!filters.bootstrap) { %>
1818
/* Responsive: Portrait tablets and up */
1919
@media screen and (min-width: 768px) {
2020
.container {
2121
max-width: 730px;
2222
}
2323
}
24-
24+
<% } %>
2525
// injector
2626
@import 'account/login/login.less';
2727
@import 'admin/admin.less';

app/templates/client/app/app(sass).scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ $fa-font-path: "/bower_components/font-awesome/fonts";
1414
color: #000;
1515
padding: 0.2em 0;
1616
}
17-
17+
<% if (!filters.bootstrap) { %>
1818
/* Responsive: Portrait tablets and up */
1919
@media screen and (min-width: 768px) {
2020
.container {
2121
max-width: 730px;
2222
}
2323
}
24-
24+
<% } %>
2525
// Component styles are injected through grunt
2626
// injector
2727
@import 'account/login/login.scss';

app/templates/client/app/app(stylus).styl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@
2727
font-weight: normal
2828
font-style: normal
2929

30-
//
30+
//
3131
// App-wide Styles
32-
//
32+
//
3333

3434
.browsehappy
3535
background #ccc
3636
color #000
3737
margin 0.2em 0
3838
padding 0.2em 0
39-
39+
<% if (!filters.bootstrap) { %>
4040
// Responsive: Portrait tablets and up
4141
@media screen and (min-width: 768px)
4242
.container
4343
max-width 730px
44-
44+
<% } %>
4545
// Component styles are injected through grunt
4646
// injector
4747
@import "account/login/login"

app/templates/client/app/main/main(html).html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ <h1>'Allo, 'Allo!</h1>
1212
<div class="row">
1313
<div class="col-lg-12">
1414
<h1 class="page-header">Features:</h1>
15-
<ul class="nav nav-tabs nav-stacked col-lg-6" ng-repeat="thing in awesomeThings">
15+
<ul class="nav nav-tabs nav-stacked col-md-4 col-lg-3 col-xs-6" ng-repeat="thing in awesomeThings">
1616
<li><a href="#" tooltip="{{thing.info}}">{{thing.name}}<% if(filters.socketio) { %><button type="button" class="close" ng-click="deleteThing(thing)">&times;</button><% } %></a></li>
1717
</ul>
1818
</div>

app/templates/client/app/main/main(jade).jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ header#banner.hero-unit
1010
.row
1111
.col-lg-12
1212
h1.page-header Features:
13-
ul.nav.nav-tabs.nav-stacked.col-lg-6(ng-repeat='thing in awesomeThings')
13+
ul.nav.nav-tabs.nav-stacked.col-md-4.col-lg-3.col-xs-6(ng-repeat='thing in awesomeThings')
1414
li
1515
a(href='#', tooltip='{{thing.info}}')
1616
| {{thing.name}}<% if(filters.socketio) { %>

0 commit comments

Comments
 (0)