From d5f920e9e10970ba59c34b07e0f4c29a8ff87a80 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Mon, 19 Jan 2015 17:51:21 +0200 Subject: [PATCH] updated robot and converted to sass --- app/assets/stylesheets/app.css.scss | 24 ------ app/assets/stylesheets/app.sass | 19 +++++ app/assets/stylesheets/bootstrap-ext.css.scss | 81 ------------------- app/assets/stylesheets/bootstrap-ext.sass | 59 ++++++++++++++ app/assets/stylesheets/login.css.scss | 13 --- app/assets/stylesheets/login.sass | 10 +++ bin/robot | 5 +- 7 files changed, 90 insertions(+), 121 deletions(-) delete mode 100644 app/assets/stylesheets/app.css.scss create mode 100644 app/assets/stylesheets/app.sass delete mode 100644 app/assets/stylesheets/bootstrap-ext.css.scss create mode 100644 app/assets/stylesheets/bootstrap-ext.sass delete mode 100644 app/assets/stylesheets/login.css.scss create mode 100644 app/assets/stylesheets/login.sass diff --git a/app/assets/stylesheets/app.css.scss b/app/assets/stylesheets/app.css.scss deleted file mode 100644 index 9bb7f3566..000000000 --- a/app/assets/stylesheets/app.css.scss +++ /dev/null @@ -1,24 +0,0 @@ -.error-tab > a { - color: #a94442 !important; -} - -.edit-highlight { - background-color: #E7E7E7; -} - -.navbar-brand { - line-height:12px; - padding-top:20px; - padding-bottom:5px; -} - -.navbar-brand small { - display:block; - font-size:10px; -} - -.footer { - color: #777; - padding-top: 15px; - font-size: 10px; -} diff --git a/app/assets/stylesheets/app.sass b/app/assets/stylesheets/app.sass new file mode 100644 index 000000000..a9b9621dd --- /dev/null +++ b/app/assets/stylesheets/app.sass @@ -0,0 +1,19 @@ +.error-tab > a + color: #a94442 !important + +.edit-highlight + background-color: #E7E7E7 + +.navbar-brand + line-height: 12px + padding-top: 20px + padding-bottom: 5px + +.navbar-brand small + display: block + font-size: 10px + +.footer + color: #777 + padding-top: 15px + font-size: 10px diff --git a/app/assets/stylesheets/bootstrap-ext.css.scss b/app/assets/stylesheets/bootstrap-ext.css.scss deleted file mode 100644 index 8ea0f72ff..000000000 --- a/app/assets/stylesheets/bootstrap-ext.css.scss +++ /dev/null @@ -1,81 +0,0 @@ -.text-left-not-xs, .text-left-not-sm, .text-left-not-md, .text-left-not-lg { - text-align: left; -} -.text-center-not-xs, .text-center-not-sm, .text-center-not-md, .text-center-not-lg { - text-align: center; -} -.text-right-not-xs, .text-right-not-sm, .text-right-not-md, .text-right-not-lg { - text-align: right; -} -.text-justify-not-xs, .text-justify-not-sm, .text-justify-not-md, .text-justify-not-lg { - text-align: justify; -} - -@media (max-width: 767px) { - .text-left-not-xs, .text-center-not-xs, .text-right-not-xs, .text-justify-not-xs { - text-align: inherit; - } - .text-left-xs { - text-align: left; - } - .text-center-xs { - text-align: center; - } - .text-right-xs { - text-align: right; - } - .text-justify-xs { - text-align: justify; - } -} -@media (min-width: 768px) and (max-width: 991px) { - .text-left-not-sm, .text-center-not-sm, .text-right-not-sm, .text-justify-not-sm { - text-align: inherit; - } - .text-left-sm { - text-align: left; - } - .text-center-sm { - text-align: center; - } - .text-right-sm { - text-align: right; - } - .text-justify-sm { - text-align: justify; - } -} -@media (min-width: 992px) and (max-width: 1199px) { - .text-left-not-md, .text-center-not-md, .text-right-not-md, .text-justify-not-md { - text-align: inherit; - } - .text-left-md { - text-align: left; - } - .text-center-md { - text-align: center; - } - .text-right-md { - text-align: right; - } - .text-justify-md { - text-align: justify; - } -} -@media (min-width: 1200px) { - .text-left-not-lg, .text-center-not-lg, .text-right-not-lg, .text-justify-not-lg { - text-align: inherit; - } - .text-left-lg { - text-align: left; - } - .text-center-lg { - text-align: center; - } - .text-right-lg { - text-align: right; - } - .text-justify-lg { - text-align: justify; - } -} diff --git a/app/assets/stylesheets/bootstrap-ext.sass b/app/assets/stylesheets/bootstrap-ext.sass new file mode 100644 index 000000000..2fd5fb61e --- /dev/null +++ b/app/assets/stylesheets/bootstrap-ext.sass @@ -0,0 +1,59 @@ +.text-left-not-xs, .text-left-not-sm, .text-left-not-md, .text-left-not-lg + text-align: left + +.text-center-not-xs, .text-center-not-sm, .text-center-not-md, .text-center-not-lg + text-align: center + +.text-right-not-xs, .text-right-not-sm, .text-right-not-md, .text-right-not-lg + text-align: right + +.text-justify-not-xs, .text-justify-not-sm, .text-justify-not-md, .text-justify-not-lg + text-align: justify + +@media (max-width: 767px) + .text-left-not-xs, .text-center-not-xs, .text-right-not-xs, .text-justify-not-xs + text-align: inherit + .text-left-xs + text-align: left + .text-center-xs + text-align: center + .text-right-xs + text-align: right + .text-justify-xs + text-align: justify + +@media (min-width: 768px) and (max-width: 991px) + .text-left-not-sm, .text-center-not-sm, .text-right-not-sm, .text-justify-not-sm + text-align: inherit + .text-left-sm + text-align: left + .text-center-sm + text-align: center + .text-right-sm + text-align: right + .text-justify-sm + text-align: justify + +@media (min-width: 992px) and (max-width: 1199px) + .text-left-not-md, .text-center-not-md, .text-right-not-md, .text-justify-not-md + text-align: inherit + .text-left-md + text-align: left + .text-center-md + text-align: center + .text-right-md + text-align: right + .text-justify-md + text-align: justify + +@media (min-width: 1200px) + .text-left-not-lg, .text-center-not-lg, .text-right-not-lg, .text-justify-not-lg + text-align: inherit + .text-left-lg + text-align: left + .text-center-lg + text-align: center + .text-right-lg + text-align: right + .text-justify-lg + text-align: justify diff --git a/app/assets/stylesheets/login.css.scss b/app/assets/stylesheets/login.css.scss deleted file mode 100644 index 69ab6c0ad..000000000 --- a/app/assets/stylesheets/login.css.scss +++ /dev/null @@ -1,13 +0,0 @@ -body { - padding-top: 40px; - padding-bottom: 40px; -} - -.form-signin { - max-width: 330px; - padding: 15px; - margin: 0 auto; - input { - margin-bottom: 10px; - } -} diff --git a/app/assets/stylesheets/login.sass b/app/assets/stylesheets/login.sass new file mode 100644 index 000000000..c132ae9b0 --- /dev/null +++ b/app/assets/stylesheets/login.sass @@ -0,0 +1,10 @@ +body + padding-top: 40px + padding-bottom: 40px + +.form-signin + max-width: 330px + padding: 15px + margin: 0 auto + input + margin-bottom: 10px diff --git a/bin/robot b/bin/robot index 9962dcea3..28fbde348 100755 --- a/bin/robot +++ b/bin/robot @@ -21,9 +21,8 @@ cp config/application-example.yml config/application.yml bundle install RAILS_ENV=test bundle exec rake db:drop -RAILS_ENV=test bundle exec rake db:create -RAILS_ENV=test bundle exec rake db:schema:load &> /dev/null -RAILS_ENV=test bundle exec rake api_log:test:schema:reload &> /dev/null +RAILS_ENV=test bundle exec rake db:all:create +RAILS_ENV=test bundle exec rake db:all:schema:load RAILS_ENV=test bundle exec rake db:seed RAILS_ENV=test bundle exec rake assets:precompile