Skip to content

Commit

Permalink
Little improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Kikobeats committed Dec 26, 2015
1 parent ea3c85b commit c99f7a3
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 10 deletions.
10 changes: 7 additions & 3 deletions assets/scss/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,10 @@ h6 a {
.blog-content {
float: left;
width: 63.26531%;

&.fullscreen {
width: 100%;
}
}

.blog-sidebar {
Expand Down Expand Up @@ -1290,7 +1294,7 @@ a.ghost-logo.animated-logo {
content: '';
}
&:after {
content: "CWMarMenor";
content: $name;
font-size: 1.6rem;
margin-left: 10px;
}
Expand All @@ -1304,11 +1308,11 @@ a.ghost-logo.animated-logo {
min-height: 30px;
}

li.nav-nete > a {
li.nav-unete > a {
@include feature-header-button($green);
}

li.nav-enviar-noticia > a {
li.nav-contacto > a {
@include feature-header-button($blue);
margin-left: 15px;

Expand Down
2 changes: 1 addition & 1 deletion assets/scss/mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
height: 30px;
min-width: 70px;
padding: 6px 10px;
margin: 15px 0 0 0;
margin: 15px 0 0;

transition: all .5s ease;

Expand Down
19 changes: 13 additions & 6 deletions assets/scss/theme.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
::selection {
background: lighten($orange, 36%);
}
::-moz-selection {
background: lighten($orange, 36%);
background: lighten($orange, 36%);
}

.button-green,
Expand Down Expand Up @@ -30,12 +27,22 @@
color: $red;
}

.button-save, .button-blue, button[type="submit"], input[type="submit"] {
.button-save,
.button-blue,
button[type="submit"],
input[type="submit"] {
background: $blue;
box-shadow: none;
}

.button-save:not(.button-loading):hover, .button-save:not(.button-loading):focus, .button-blue:not(.button-loading):hover, .button-blue:not(.button-loading):focus, button[type="submit"]:not(.button-loading):hover, button[type="submit"]:not(.button-loading):focus, input[type="submit"]:not(.button-loading):hover, input[type="submit"]:not(.button-loading):focus {
.button-save:not(.button-loading):hover,
.button-save:not(.button-loading):focus,
.button-blue:not(.button-loading):hover,
.button-blue:not(.button-loading):focus,
button[type="submit"]:not(.button-loading):hover,
button[type="submit"]:not(.button-loading):focus,
input[type="submit"]:not(.button-loading):hover,
input[type="submit"]:not(.button-loading):focus {
background: darken($blue, 10%);
}

Expand Down
3 changes: 3 additions & 0 deletions assets/scss/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,6 @@ $red : #e74c3c;
$orange : #e67e22;
$green : #2ecc71;
$yellow : #f1c40f;

// Others
$name : 'Zombeats';

0 comments on commit c99f7a3

Please sign in to comment.