javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

moved fonts to themes

Browse Source
This commit is contained in:
Adam Bradley
2013-08-26 15:26:42 -05:00
parent 7b55036fa7
commit 6fdd4d9fe3
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/framework.css vendored
View File

@@ -533,4 +533,4 @@ a.list-item {
background: #eee; }
.panel-content {
background: #eee; }
background: #eeeeee; }

6
scss/framework/_structure-variables.scss
View File

@@ -1,7 +1,4 @@
$sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$lightSansFontFamily: "Helvetica Neue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$serifFontFamily: Georgia, "Times New Roman", Times, serif !default;
$monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace !default;
$baseFontSize: 14px !default;
$baseFontFamily: $sansFontFamily;
@@ -28,5 +25,6 @@ $barPaddingLandscape : 5px;
// Lists
$listItemBorder: 1px solid #ddd;
// Panels
$panelViewWidth: 17em;

17
scss/framework/_theme-variables.scss
View File

@@ -1,8 +1,15 @@
// Fonts
$sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$lightSansFontFamily: "Helvetica Neue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$serifFontFamily: Georgia, "Times New Roman", Times, serif !default;
$monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace !default;
// Typography
$lightColor: #fff;
$darkColor: #333;
//
// Buttons
$buttonColor: #222;
$buttonPadding: 10px 15px;
@@ -33,7 +40,6 @@ $buttonWarningBackground: #f0b840;
$buttonWarningBackgroundActive: #eee;
$buttonWarningBorder: #cf9a29;
$buttonDangerBackground: #de5645;
$buttonDangerBackgroundActive: #eee;
$buttonDangerBorder: #bc4435;
@@ -43,7 +49,7 @@ $buttonDarkBackgroundActive: #eee;
$buttonDarkBorder: #111;
//
// Bars
$barBackground: white;
@@ -77,8 +83,8 @@ $barDarkBorderColor: #111;
$listDividerBackground: #f5f5f5;
$listDividerColor: #222;
// Form states and alerts
// -------------------------
$warningText: #c09853;
$warningBackground: #fcf8e3;
$warningBorder: darken(adjust-hue($warningBackground, -10), 3%);
@@ -95,3 +101,6 @@ $infoText: #3a87ad;
$infoBackground: #d9edf7;
$infoBorder: darken(adjust-hue($infoBackground, -10), 7%);
// Panels
$panelBackground: #eee;

2
scss/framework/theme/_panel.scss
View File

@@ -1,4 +1,4 @@
.panel-content {
background: #eee;
background: $panelBackground;
}