ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-28 13:31:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'feature/ui-improvements' into develop

Browse source
This commit is contained in:
Luke Barratt 2015-04-08 09:22:55 +01:00
commit f4f99eea2d
5 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/themes/default/components/_flashes.scss
View file

@ -5,7 +5,7 @@
.flash { .flash {
@include span-columns(12); @include span-columns(12);
margin-bottom: 20px; margin-bottom: 20px;
font-weight: 400; font-weight: bold;
&.notice { &.notice {
@include flash; @include flash;
@ -109,4 +109,4 @@ div#errors {
} }
} }
} }
} }

7
app/assets/stylesheets/themes/default/layout/_body.scss
View file

@ -27,6 +27,13 @@ body#tinymce {
#container { #container {
min-height: 100%; min-height: 100%;
min-width: 1020px;
background: {
color: $blue;
image: image-url("#{$theme-path}/layout/background.jpg");
position: top center;
repeat: no-repeat;
}
} }
.wrapper { .wrapper {

2
app/assets/stylesheets/themes/default/layout/_hacks.scss
View file

@ -6,4 +6,4 @@ select {
-moz-appearance: none; -moz-appearance: none;
text-indent: 0.01px; text-indent: 0.01px;
text-overflow: ''; text-overflow: '';
} }

4
app/assets/stylesheets/themes/default/layout/_typography.scss
View file

@ -10,6 +10,7 @@ body {
font-family: $base-font-family; font-family: $base-font-family;
font-size: $base-font-size; font-size: $base-font-size;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
line-height: $base-line-height; line-height: $base-line-height;
} }
@ -17,6 +18,7 @@ h1, h2, h3, h4, h5, h6 {
font-family: $header-font-family; font-family: $header-font-family;
line-height: 1.25em; line-height: 1.25em;
margin: 0; margin: 0;
opacity:0.99;
text-rendering: optimizeLegibility; // Fix the character spacing for headings text-rendering: optimizeLegibility; // Fix the character spacing for headings
font-weight: 400; font-weight: 400;
@ -56,7 +58,7 @@ p {
a { a {
color: $base-link-color; color: $base-link-color;
text-decoration: none; text-decoration: none;
font-weight: 400; font-weight: bold;
@include transition(color 0.1s linear); @include transition(color 0.1s linear);
&:hover { &:hover {

2
app/assets/stylesheets/themes/default/pages/_users.scss
View file

@ -222,4 +222,4 @@ table.staff {
.age { .age {
width: 5%; width: 5%;
} }
} }