diff options
| author | Varac <varac@leap.se> | 2017-10-16 14:21:55 +0200 |
|---|---|---|
| committer | Varac <varac@leap.se> | 2017-10-16 14:21:55 +0200 |
| commit | c3e807eb42ea7389676b714584bde204eab18577 (patch) | |
| tree | d9ac909ff468ff2f00f03a29ab3f9b4ba05a56a7 /templates | |
| parent | 64a3927db5440fe2c9b5c4d02667cb0749884c40 (diff) | |
| parent | 2917ad9519d6f872d51582d335a147bf2e5f935e (diff) | |
Merge branch 'upgrade_dashing'
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/project/Gemfile | 2 | ||||
| -rw-r--r-- | templates/project/README.md | 2 | ||||
| -rw-r--r-- | templates/project/assets/stylesheets/application.scss | 12 | ||||
| -rw-r--r-- | templates/project/dashboards/layout.erb | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/templates/project/Gemfile b/templates/project/Gemfile index 1235b37..46fea32 100644 --- a/templates/project/Gemfile +++ b/templates/project/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'dashing' +gem 'smashing' ## Remove this if you don't need a twitter widget. gem 'twitter', '>= 5.9.0'
\ No newline at end of file diff --git a/templates/project/README.md b/templates/project/README.md index 260ac2a..7bd2471 100644 --- a/templates/project/README.md +++ b/templates/project/README.md @@ -1 +1 @@ -Check out http://shopify.github.com/dashing for more information.
\ No newline at end of file +Check out http://smashing.github.io/smashing for more information. diff --git a/templates/project/assets/stylesheets/application.scss b/templates/project/assets/stylesheets/application.scss index 9a7ec7c..fe4fe22 100644 --- a/templates/project/assets/stylesheets/application.scss +++ b/templates/project/assets/stylesheets/application.scss @@ -8,14 +8,14 @@ $background-color: #222; $text-color: #fff; -$background-warning-color-1: #e82711; -$background-warning-color-2: #9b2d23; -$text-warning-color: #fff; - -$background-danger-color-1: #eeae32; -$background-danger-color-2: #ff9618; +$background-danger-color-1: #e82711; +$background-danger-color-2: #9b2d23; $text-danger-color: #fff; +$background-warning-color-1: #eeae32; +$background-warning-color-2: #ff9618; +$text-warning-color: #fff; + @-webkit-keyframes status-warning-background { 0% { background-color: $background-warning-color-1; } 50% { background-color: $background-warning-color-2; } diff --git a/templates/project/dashboards/layout.erb b/templates/project/dashboards/layout.erb index 4aa5120..76a1704 100644 --- a/templates/project/dashboards/layout.erb +++ b/templates/project/dashboards/layout.erb @@ -13,7 +13,7 @@ <link rel="stylesheet" href="/assets/application.css"> <link href='//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700' rel='stylesheet' type='text/css'> - <link rel="icon" href="/assets/favicon.ico"> + <link rel="icon" href="/public/favicon.ico"> </head> <body> |