Permalink
Browse files

change style.scss to application and add variables

  • Loading branch information...
zankavrogin committed Mar 23, 2015
1 parent 56f3bf6 commit b5f2661bee58a124c229ac291e7826d57962eea7
Showing with 65 additions and 10 deletions.
  1. +3 −3 Makefile
  2. +1 −1 index.html
  3. +61 −0 src/stylesheets/application.scss
  4. +0 −6 src/stylesheets/style.scss
View
@@ -3,11 +3,11 @@ TEST_FILES := spec/helper.js $(shell find spec/components -type f)
ifneq (,$(shell sassc --version 2>/dev/null))
SASS_COMPILER := sassc
- SASS_ARGS := src/stylesheets/style.scss css/style.css
+ SASS_ARGS := src/stylesheets/application.scss css/application.css
SASS_WATCH_CMD := find ./src/stylesheets -type f | grep -v "bourbon" | grep -v "neat" | peat "$(SASS_COMPILER) $(SASS_ARGS)"
else
SASS_COMPILER := sass
- SASS_ARGS := src/stylesheets/style.scss:css/style.css
+ SASS_ARGS := src/stylesheets/application.scss:css/application.css
SASS_WATCH_CMD := $(SASS_COMPILER) --watch $(SASS_ARGS)
endif
@@ -62,4 +62,4 @@ minified: clean
test:
@$(BIN)mocha --colors -R dot $(TEST_FILES)
-.PHONY: help lint css js watch-js watch-css clean all minified test
+.PHONY: help lint css js watch-js watch-css clean all minified test
View
@@ -5,7 +5,7 @@
<title>Robeaux</title>
- <link rel="stylesheet" href="/css/style.css">
+ <link rel="stylesheet" href="/css/application.css">
</head>
<body>
@@ -0,0 +1,61 @@
+@import "normalize";
+@import "fonts";
+@import "bourbon/bourbon";
+@import "neat/neat";
+
+/* Grid Settings */
+$grid-columns : 12;
+$max-width : 966px;
+
+/* Color Palette */
+$color01: #EFEEF4;
+$color02: #444;
+$color03: #000;
+$color04: #1CBBD8;
+$color05: #fff;
+$color06: #fff;
+
+/* Body Variables */
+$body-background-color: $color01;
+$body-text-color : $color02;
+$body-font-family : "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
+$body-font-size : 15px;
+$line-height-base : 1.428571429;
+
+/* Code Font */
+$code-font-family : Inconsolata, monospace;
+
+/* Nav Variables */
+$nav-background-color : $color03;
+$nav-link-color : #fff;
+$nav-link-color-hover : $color04;
+$nav-link-background : $color03;
+$nav-link-background-hover : $color04;
+
+/* Buttons */
+$btn-robot-color : #fff;
+$btn-robot-background : $color04;
+$btn-run-color : #fff;
+$btn-run-background : #C36148;
+$btn-device-color : #fff;
+$btn-device-background : #48CAAC;
+$btn-connect-color : #fff;
+$btn-connect-background : #DEC763;
+
+/* Forms */
+$input-border-color: #ccc;
+$input-border-color-focus: $color04;
+
+/* Connection Digits */
+$connection-digits-color: $color04;
+
+/* Widgets */
+$modal-bg-color: #fff;
+
+@import "support/buttons";
+@import "themes/default";
+@import "views/body";
+@import "objects/buttons";
+@import "objects/device";
+@import "objects/nav";
+@import "objects/robots";
@@ -1,6 +0,0 @@
-@import "normalize";
-@import "fonts";
-@import "bourbon/bourbon";
-@import "neat/neat";
-
-@import "themes/default";

0 comments on commit b5f2661

Please sign in to comment.