Skip to content

Commit b11c564

Browse files
author
Alexander Anpleenko
committed
add box-sizing
1 parent 66dce43 commit b11c564

11 files changed

Lines changed: 135 additions & 142 deletions

‎dist/modfiles.without.bootstrap.css‎

Lines changed: 72 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
.text-overflow,
88
.block-center,
99
.transform-middle,
10+
ul.menu-list>li>a,
1011
.db {
1112
display: block;
1213
}
@@ -82,6 +83,10 @@
8283
text-decoration: underline;
8384
}
8485

86+
ul.menu-list>li {
87+
float: left;
88+
}
89+
8590
.fn {
8691
float: none;
8792
}
@@ -90,7 +95,22 @@
9095
text-shadow: -1px -1px 1px rgba(255, 255, 255, .2), 1px 1px 1px rgba(255, 255, 255, .2), 1px 1px 1px rgba(0, 0, 0, .7);
9196
}
9297

93-
.lsn li {
98+
ul.menu-list {
99+
*zoom: 1;
100+
}
101+
102+
ul.menu-list:before,
103+
ul.menu-list:after {
104+
content: " ";
105+
display: table;
106+
}
107+
108+
ul.menu-list:after {
109+
clear: both;
110+
}
111+
112+
.lsn li,
113+
ul.menu-list>li {
94114
list-style: none;
95115
}
96116

@@ -109,46 +129,6 @@ html {
109129
font-size: 14px;
110130
}
111131

112-
.text-left {
113-
text-align: left;
114-
}
115-
116-
.text-center {
117-
text-align: center;
118-
}
119-
120-
.text-right {
121-
text-align: right;
122-
}
123-
124-
.text-justify {
125-
text-align: justify;
126-
}
127-
128-
.text-nowrap {
129-
white-space: nowrap;
130-
}
131-
132-
.text-lowercase {
133-
text-transform: lowercase;
134-
}
135-
136-
.text-uppercase {
137-
text-transform: uppercase;
138-
}
139-
140-
.text-capitalize {
141-
text-transform: capitalize;
142-
}
143-
144-
.pull-left {
145-
float: left !important;
146-
}
147-
148-
.pull-right {
149-
float: right !important;
150-
}
151-
152132
.text-white {
153133
color: #fff;
154134
}
@@ -208,6 +188,11 @@ html {
208188
transform: translateY(-50%);
209189
}
210190

191+
ul.menu-list {
192+
padding-left: 0;
193+
margin-bottom: 0;
194+
}
195+
211196
.fz12 {
212197
font-size: 12px;
213198
font-size: .85714rem;
@@ -338,3 +323,49 @@ html {
338323
.fw900 {
339324
font-weight: 900;
340325
}
326+
327+
.text-left {
328+
text-align: left;
329+
}
330+
331+
.text-center {
332+
text-align: center;
333+
}
334+
335+
.text-right {
336+
text-align: right;
337+
}
338+
339+
.text-justify {
340+
text-align: justify;
341+
}
342+
343+
.text-nowrap {
344+
white-space: nowrap;
345+
}
346+
347+
.text-lowercase {
348+
text-transform: lowercase;
349+
}
350+
351+
.text-uppercase {
352+
text-transform: uppercase;
353+
}
354+
355+
.text-capitalize {
356+
text-transform: capitalize;
357+
}
358+
359+
.pull-left {
360+
float: left !important;
361+
}
362+
363+
.pull-right {
364+
float: right !important;
365+
}
366+
367+
*,
368+
*:after,
369+
*:before {
370+
box-sizing: border-box;
371+
}

‎dist/modfiles.without.bootstrap.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.

‎scss/mixin/_box-sizing.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@mixin box-sizing($box-model) {
2+
-webkit-box-sizing: $box-model; // Safari <= 5
3+
-moz-box-sizing: $box-model; // Firefox <= 19
4+
box-sizing: $box-model;
5+
}

‎scss/modfiles.scss‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
//main style
88
@import "meta/base";
9-
@import "modfiles/bootstrap";
109
@import "modfiles/underline";
1110
@import "modfiles/text";
1211
@import "modfiles/margin";
@@ -21,7 +20,7 @@
2120
@import "modfiles/outline";
2221
@import "modfiles/fluid";
2322
@import "modfiles/float";
24-
@import "modfiles/hide";
23+
@import "modfiles/hard-hide";
2524

2625
// font style
2726
@import "modfiles/font-size";

‎scss/modfiles.without.bootstrap.scss‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,7 @@
11
// core
2-
@import "modfiles/variables.without.bootstrap";
3-
@import "extend/extend";
4-
@import "function/color";
5-
@import "mixin/font-size";
2+
@import "modfiles";
63

7-
//main style
8-
@import "meta/base";
9-
@import "modfiles/bootstrap";
10-
@import "modfiles/underline";
11-
@import "modfiles/text";
12-
@import "modfiles/margin";
13-
@import "modfiles/padding";
14-
@import "modfiles/cursor";
15-
@import "modfiles/center";
16-
@import "modfiles/middle";
17-
@import "modfiles/list";
18-
@import "modfiles/position";
19-
@import "modfiles/display";
20-
@import "modfiles/select";
21-
@import "modfiles/outline";
22-
@import "modfiles/fluid";
23-
@import "modfiles/float";
24-
@import "modfiles/hide";
4+
@import "mixin/box-sizing";
255

26-
// font style
27-
@import "modfiles/font-size";
28-
@import "modfiles/font-weight";
6+
@import "modfiles/bootstrap";
7+
@import "modfiles/box-sizing";

‎scss/modfiles/_bootstrap.scss‎

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,39 @@
1-
@if $bootstrap == false {
2-
.text-left {
3-
text-align: left;
4-
}
5-
6-
.text-center {
7-
text-align: center;
8-
}
9-
10-
.text-right {
11-
text-align: right;
12-
}
13-
14-
.text-justify {
15-
text-align: justify;
16-
}
17-
18-
.text-nowrap {
19-
white-space: nowrap;
20-
}
21-
22-
.text-lowercase {
23-
text-transform: lowercase;
24-
}
25-
26-
.text-uppercase {
27-
text-transform: uppercase;
28-
}
29-
30-
.text-capitalize {
31-
text-transform: capitalize;
32-
}
33-
34-
.pull-left {
35-
float: left !important;
36-
}
37-
38-
.pull-right {
39-
float: right !important;
40-
}
1+
.text-left {
2+
text-align: left;
3+
}
4+
5+
.text-center {
6+
text-align: center;
7+
}
8+
9+
.text-right {
10+
text-align: right;
11+
}
12+
13+
.text-justify {
14+
text-align: justify;
15+
}
16+
17+
.text-nowrap {
18+
white-space: nowrap;
19+
}
20+
21+
.text-lowercase {
22+
text-transform: lowercase;
23+
}
24+
25+
.text-uppercase {
26+
text-transform: uppercase;
27+
}
28+
29+
.text-capitalize {
30+
text-transform: capitalize;
31+
}
32+
33+
.pull-left {
34+
float: left !important;
35+
}
36+
37+
.pull-right {
38+
float: right !important;
4139
}

‎scss/modfiles/_box-sizing.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
*,
2+
*:after,
3+
*:before {
4+
@include box-sizing(border-box);
5+
}

scss/modfiles/_hide.scss renamed to scss/modfiles/_hard-hide.scss

File renamed without changes.

‎scss/modfiles/_list.scss‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
}
55
}
66

7-
@if $bootstrap == true {
8-
ul.menu-list {
9-
padding-left: 0;
10-
margin-bottom: 0;
11-
@extend %clearfix;
12-
> li {
13-
@extend %list-style-none;
14-
@extend %float-left;
15-
> a {
16-
@extend %display-block;
17-
}
7+
ul.menu-list {
8+
padding-left: 0;
9+
margin-bottom: 0;
10+
@extend %clearfix;
11+
> li {
12+
@extend %list-style-none;
13+
@extend %float-left;
14+
> a {
15+
@extend %display-block;
1816
}
1917
}
2018
}

‎scss/modfiles/_variables.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
$px: px;
22
$rem: rem;
3-
$bootstrap: true;
43
$need_outline: true;
54
$base_font: 14;
65

0 commit comments

Comments
 (0)