Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 260af75

Browse files
committed
Scss posun
1 parent f66e553 commit 260af75

File tree

3 files changed

+22
-44
lines changed

3 files changed

+22
-44
lines changed

‎Gruntfile.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ module.exports = function(grunt) {
2626
implementation: sass,
2727
sourceMap: true
2828
},
29-
dist: {
30-
"css/style.css": "scss/index.scss"
29+
default: {
30+
files: {
31+
"css/style.css": "scss/index.scss"
32+
}
3133
}
3234
},
3335

‎scss/lib/_mixins.scss‎

Lines changed: 15 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// Webkit-style focus
1010
// ------------------
11-
.tab-focus() {
11+
@mixintab-focus() {
1212
// Default
1313
outline: thin dotted #333;
1414
// Webkit
@@ -18,65 +18,41 @@
1818

1919
// Center-align a block level element
2020
// ----------------------------------
21-
.center-block() {
21+
@mixincenter-block() {
2222
display: block;
2323
margin-left: auto;
2424
margin-right: auto;
2525
}
2626

27-
// IE7 inline-block
28-
// ----------------
29-
.ie7-inline-block() {
30-
*display: inline; /* IE7 inline-block hack */
31-
*zoom: 1;
32-
}
33-
34-
// IE7 likes to collapse whitespace on either side of the inline-block elements.
35-
// Ems because we're attempting to match the width of a space character. Left
36-
// version is for form buttons, which typically come after other elements, and
37-
// right version is for icons, which come before. Applying both is ok, but it will
38-
// mean that space between those elements will be .6em (~2 space characters) in IE7,
39-
// instead of the 1 space in other browsers.
40-
.ie7-restore-left-whitespace() {
41-
*margin-left: .3em;
42-
43-
&:first-child {
44-
*margin-left: 0;
45-
}
46-
}
47-
48-
.ie7-restore-right-whitespace() {
49-
*margin-right: .3em;
50-
}
51-
5227
// Sizing shortcuts
5328
// -------------------------
54-
.size(@height, @width) {
55-
width: @width;
56-
height: @height;
29+
@mixinsize($height, $width) {
30+
width: $width;
31+
height: $height;
5732
}
58-
.square(@size) {
59-
.size(@size, @size);
33+
34+
@mixin square($size) {
35+
@include size($size, $size);
6036
}
6137

6238
// Placeholder text
6339
// -------------------------
64-
.placeholder(@color) {
40+
@mixinplaceholder($color) {
6541
&:-moz-placeholder {
66-
color: @color;
42+
color: $color;
6743
}
6844
&:-ms-input-placeholder {
69-
color: @color;
45+
color: $color;
7046
}
7147
&::-webkit-input-placeholder {
72-
color: @color;
48+
color: $color;
7349
}
7450
}
7551

7652
// Text overflow
7753
// -------------------------
7854
// Requires inline-block or block for proper styling
79-
.text-overflow() {
55+
@mixintext-overflow() {
8056
overflow: hidden;
8157
text-overflow: ellipsis;
8258
white-space: nowrap;
@@ -85,7 +61,7 @@
8561
// CSS image replacement
8662
// -------------------------
8763
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
88-
.hide-text {
64+
@mixinhide-text {
8965
font: 0/0 a;
9066
color: transparent;
9167
text-shadow: none;
@@ -98,7 +74,7 @@
9874
// -----------------------------------
9975
// Používáme např. v .out-of-box--blur
10076

101-
.out-of-box-white-text() {
77+
@mixinout-of-box-white-text() {
10278

10379
&,
10480
h1,

‎scss/variables/_variables.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ $small-end-value: ($large-start-value - 1);
5959

6060
// Media Queries
6161
// (Pouzivame napr. jako @media @medium-start { ... }
62-
$small-end: ~"only screen and (max-width: @{small-end-value})";
63-
$large-start: ~"only screen and (min-width: @{large-start-value})";
64-
$extra-large-start: ~"only screen and (min-width: @{extra-large-start-value})";
62+
$small-end: "only screen and (max-width: #{small-end-value})";
63+
$large-start: "only screen and (min-width: #{large-start-value})";
64+
$extra-large-start: "only screen and (min-width: #{extra-large-start-value})";
6565

6666

6767
// Padding

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /