dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Styling

Browse Source
This commit is contained in:
Ruud
2014-12-14 12:04:26 +01:00
parent d77cfb3e69
commit b8b6024592
4 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/static/style/combined.min.css
Vendored
+1
View File
File diff suppressed because one or more lines are too long
couchpotato/static/style/fonts.scss
+38 -41
View File
@@ -1,23 +1,22 @@
/* Fonts */ /* Fonts */
@font-face { @font-face {
font-family: 'Elusive-Icons'; font-family: 'Elusive-Icons';
src:url('../static/fonts/Elusive-Icons.eot'); src:url('../fonts/Elusive-Icons.eot');
src:url('../static/fonts/Elusive-Icons.eot?#iefix') format('embedded-opentype'), src:url('../fonts/Elusive-Icons.eot?#iefix') format('embedded-opentype'),
url('../static/fonts/Elusive-Icons.woff') format('woff'), url('../fonts/Elusive-Icons.woff') format('woff'),
url('../static/fonts/Elusive-Icons.ttf') format('truetype'), url('../fonts/Elusive-Icons.ttf') format('truetype'),
url('../static/fonts/Elusive-Icons.svg#Elusive-Icons') format('svg'); url('../fonts/Elusive-Icons.svg#Elusive-Icons') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'OpenSans'; font-family: 'OpenSans';
src: url('../static/fonts/OpenSans-Light-webfont.eot'); src: url('../fonts/OpenSans-Light-webfont.eot');
src: url('../static/fonts/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'), src: url('../fonts/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'),
url('../static/fonts/OpenSans-Light-webfont.woff') format('woff'), url('../fonts/OpenSans-Light-webfont.woff') format('woff'),
url('../static/fonts/OpenSans-Light-webfont.ttf') format('truetype'), url('../fonts/OpenSans-Light-webfont.ttf') format('truetype'),
url('../static/fonts/OpenSans-Light-webfont.svg#OpenSansRegular') format('svg'); url('../fonts/OpenSans-Light-webfont.svg#OpenSansRegular') format('svg');
font-weight: 200; font-weight: 200;
font-style: normal; font-style: normal;
@@ -25,57 +24,55 @@
@font-face { @font-face {
font-family: 'OpenSans'; font-family: 'OpenSans';
src: url('../static/fonts/OpenSans-Regular-webfont.eot'); src: url('../fonts/OpenSans-Regular-webfont.eot');
src: url('../static/fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'), src: url('../fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
url('../static/fonts/OpenSans-Regular-webfont.woff') format('woff'), url('../fonts/OpenSans-Regular-webfont.woff') format('woff'),
url('../static/fonts/OpenSans-Regular-webfont.ttf') format('truetype'), url('../fonts/OpenSans-Regular-webfont.ttf') format('truetype'),
url('../static/fonts/OpenSans-Regular-webfont.svg#OpenSansRegular') format('svg'); url('../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'OpenSans'; font-family: 'OpenSans';
src: url('../static/fonts/OpenSans-Italic-webfont.eot'); src: url('../fonts/OpenSans-Italic-webfont.eot');
src: url('../static/fonts/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'), src: url('../fonts/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'),
url('../static/fonts/OpenSans-Italic-webfont.woff') format('woff'), url('../fonts/OpenSans-Italic-webfont.woff') format('woff'),
url('../static/fonts/OpenSans-Italic-webfont.ttf') format('truetype'), url('../fonts/OpenSans-Italic-webfont.ttf') format('truetype'),
url('../static/fonts/OpenSans-Italic-webfont.svg#OpenSansItalic') format('svg'); url('../fonts/OpenSans-Italic-webfont.svg#OpenSansItalic') format('svg');
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: 'OpenSans'; font-family: 'OpenSans';
src: url('../static/fonts/OpenSans-Bold-webfont.eot'); src: url('../fonts/OpenSans-Bold-webfont.eot');
src: url('../static/fonts/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'), src: url('../fonts/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'),
url('../static/fonts/OpenSans-Bold-webfont.woff') format('woff'), url('../fonts/OpenSans-Bold-webfont.woff') format('woff'),
url('../static/fonts/OpenSans-Bold-webfont.ttf') format('truetype'), url('../fonts/OpenSans-Bold-webfont.ttf') format('truetype'),
url('../static/fonts/OpenSans-Bold-webfont.svg#OpenSansBold') format('svg'); url('../fonts/OpenSans-Bold-webfont.svg#OpenSansBold') format('svg');
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'OpenSans'; font-family: 'OpenSans';
src: url('../static/fonts/OpenSans-BoldItalic-webfont.eot'); src: url('../fonts/OpenSans-BoldItalic-webfont.eot');
src: url('../static/fonts/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'), src: url('../fonts/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
url('../static/fonts/OpenSans-BoldItalic-webfont.woff') format('woff'), url('../fonts/OpenSans-BoldItalic-webfont.woff') format('woff'),
url('../static/fonts/OpenSans-BoldItalic-webfont.ttf') format('truetype'), url('../fonts/OpenSans-BoldItalic-webfont.ttf') format('truetype'),
url('../static/fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic') format('svg'); url('../fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic') format('svg');
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: 'Lobster'; font-family: 'Lobster';
src: url('../static/fonts/Lobster-webfont.eot'); src: url('../fonts/Lobster-webfont.eot');
src: url('../static/fonts/Lobster-webfont.eot?#iefix') format('embedded-opentype'), src: url('../fonts/Lobster-webfont.eot?#iefix') format('embedded-opentype'),
url('../static/fonts/Lobster-webfont.woff') format('woff'), url('../fonts/Lobster-webfont.woff') format('woff'),
url('../static/fonts/Lobster-webfont.ttf') format('truetype'), url('../fonts/Lobster-webfont.ttf') format('truetype'),
url('../static/fonts/Lobster-webfont.svg#lobster_1.4regular') format('svg'); url('../fonts/Lobster-webfont.svg#lobster_1.4regular') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
couchpotato/static/style/main.scss
+7 -7
View File
@@ -8,8 +8,9 @@ body, html {
height: 100%; height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
background: #111; background: $menu_color;
-webkit-font-smoothing: subpixel-antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
overflow: hidden; overflow: hidden;
} }
@@ -35,11 +36,11 @@ a {
.navigation { .navigation {
.logo { .logo {
background: #ac0000; background: $couch_color;
display: block; display: block;
text-align: center; text-align: center;
font-family: Lobster; font-family: Lobster, serif;
color: #FFF; color: #FFF;
font-size: 38px; font-size: 38px;
line-height: 80px; line-height: 80px;
@@ -67,11 +68,10 @@ a {
} }
} }
.content { .content {
@include flex(1 auto); @include flex(1 auto);
background: #FFF; background: $background_color;
border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px;
overflow: hidden; overflow: hidden;
@@ -82,7 +82,7 @@ a {
.pages { .pages {
height: 100%; height: 100%;
widows: 100%; width: 100%;
} }
.footer { .footer {
couchpotato/static/style/mixins.scss
+5
View File
@@ -1,3 +1,8 @@
$couch_color: #ac0000;
$background_color: #FFF;
$menu_color: #111;
$theme_off: #f2f2f2;
@mixin flexbox() { @mixin flexbox() {
display: -webkit-box; display: -webkit-box;
display: -moz-box; display: -moz-box;