Permalink
Browse files

merged with upstream master and set the year in before(:all) for cale…

…ndar_controller_spec
  • Loading branch information...
christinelu committed May 2, 2012
2 parents 66a6611 + cb774c2 commit a0b8aa3c60244838fb10599d7c65ebc07de9cab9
Showing with 372 additions and 268 deletions.
  1. BIN app/assets/stylesheets/.sass-cache/db9767e4adf0695b133a4e7fb57490b1d3a50a97/application.scssc
  2. BIN app/assets/stylesheets/.sass-cache/db9767e4adf0695b133a4e7fb57490b1d3a50a97/login.scssc
  3. BIN app/assets/stylesheets/.sass-cache/db9767e4adf0695b133a4e7fb57490b1d3a50a97/shared.scssc
  4. +14 −16 app/assets/stylesheets/compiled/application.css
  5. +22 −45 app/assets/stylesheets/compiled/login.css
  6. +36 −0 app/assets/stylesheets/compiled/shared.css
  7. +20 −20 app/assets/stylesheets/sass/application.scss
  8. +45 −71 app/assets/stylesheets/sass/login.scss
  9. +50 −0 app/assets/stylesheets/sass/shared.scss
  10. +9 −12 app/controllers/calendar_controller.rb
  11. +8 −0 app/controllers/nurse_controller.rb
  12. +5 −5 app/views/admin_manager/index.html.haml
  13. +16 −5 app/views/admin_unit/index.html.haml
  14. +5 −7 app/views/calendar/index.html.haml
  15. +6 −6 app/views/devise/_links.haml
  16. +5 −7 app/views/devise/passwords/new.html.haml
  17. +9 −11 app/views/devise/sessions/new.html.haml
  18. +5 −4 app/views/layouts/application.html.haml
  19. +2 −1 app/views/layouts/devise.html.haml
  20. +0 −1 app/views/nurse/_form.html.haml
  21. +3 −3 app/views/nurse/_nurses_table.html.haml
  22. +2 −3 app/views/nurse/edit.html.haml
  23. +3 −6 app/views/shared/_flash.html.haml
  24. +2 −2 app/views/unit/index.html.haml
  25. +3 −1 app/views/users/_admin_navigation.html.haml
  26. +2 −4 app/views/users/_nurse_navigation.html.haml
  27. +3 −3 features/admin_nurse_finalize.feature
  28. +22 −14 features/admin_unit_view.feature
  29. +31 −14 features/email_notification.feature
  30. +6 −6 features/nurse_finalize_schedule.feature
  31. +9 −0 features/step_definitions/admin_steps.rb
  32. +15 −1 features/step_definitions/nurse_steps.rb
  33. +13 −0 features/step_definitions/unit_steps.rb
  34. +1 −0 spec/controllers/calendar_controller_spec.rb
@@ -1,9 +1,4 @@
/* application.scss */
-body {
- background-color: #d5d0cf;
- color: #454545;
- font-family: 'Open Sans', sans-serif; }
-
#container {
margin: 80px auto 0 auto;
width: 960px; }
@@ -39,13 +34,13 @@ body {
#navigation ul {
float: right;
- margin-top: -2px;
+ margin-top: 6px;
margin-left: 0;
padding-left: 0;
display: inline; }
#navigation ul li {
- padding: 0px 10px;
- border-left: 1px solid #454545;
+ padding: 8px 10px 0px 10px;
+ border-left: 2px solid #7c7c7c;
list-style: none;
display: inline; }
#navigation ul li.first {
@@ -54,9 +49,6 @@ body {
#content {
padding: 0 0 30px 0; }
-.clear {
- clear: both; }
-
.separator {
width: 100%;
margin: 0 auto;
@@ -107,11 +99,6 @@ label {
text-align: center;
padding: 20px; }
-#flash .error {
- color: red; }
-#flash .notice {
- color: #cd3301; }
-
#add-seg {
width: 500px;
float: left; }
@@ -123,3 +110,14 @@ label {
#calendar-links {
margin-bottom: 40px; }
+
+input {
+ border: 1px;
+ font-family: 'Open Sans', sans-serif;
+ background-color: #e4e3e3;
+ margin: 10px 5px 10px 5px;
+ border-radius: 3px;
+ padding: 3px; }
+
+.delete-button {
+ width: 80px; }
@@ -1,12 +1,8 @@
/* login.scss */
-body {
- background-color: #d5d0cf; }
-
#login {
width: 600px; }
#container {
- font-family: 'Open Sans', sans-serif;
color: white;
background-image: url("../mascot.png");
background-position: right bottom;
@@ -42,37 +38,29 @@ body {
padding-left: 7px;
padding-right: 7px; }
-#login input.submit {
+#login #signup input.submit {
width: 200px;
height: 106px;
- background-color: #00a198;
+ background-color: #310030;
border: none;
color: #FFFFFF;
font-weight: 600;
font-size: 120%;
border-radius: 10px;
padding-left: 7px;
padding-right: 7px; }
-
-#login input.submit:hover {
- background-color: #01b0a6; }
-
-.left {
- float: left; }
-
-.right {
- float: right; }
+#login #signup input.submit:hover {
+ background-color: #410140;
+ cursor: pointer; }
#login .left {
- width: 60%; }
-
+ width: 60%;
+ float: left; }
#login .right {
position: absolute;
- bottom: 0;
- right: 0; }
-
-.clear {
- clear: both; }
+ bottom: 40px;
+ right: 0;
+ float: right; }
#login #form {
position: relative; }
@@ -82,27 +70,16 @@ body {
text-align: right;
font-size: 90%; }
-ul {
- margin-left: 0;
- padding-left: 0;
- display: inline; }
- ul li {
- padding: 0px 15px;
- border-left: 1px solid #454545;
- list-style: none;
- display: inline; }
- ul li.first {
- border-left: 0px; }
- ul a {
- color: #cd3301;
- text-decoration: none;
- font-weight: bold; }
- ul a:hover {
- color: #a62900; }
+#remember-me .checkbox {
+ width: 30px; }
+
+a {
+ font-weight: bold;
+ text-decoration: none;
+ color: #310030; }
+ a:hover {
+ color: #410140; }
-#tempnavi {
- text-transform: uppercase;
- font-family: 'Open Sans', serif;
- top: 20px;
- right: 20px;
- position: absolute; }
+.login-links {
+ font-size: 80%;
+ padding-left: 20px; }
@@ -0,0 +1,36 @@
+/* shared.scss */
+body {
+ background-color: #d5d0cf;
+ color: #454545;
+ font-family: 'Open Sans', sans-serif; }
+
+.flash-msg {
+ font-weight: bold;
+ color: #cd3301;
+ background-color: #e4e3e3;
+ border: 1px solid #cd3301;
+ border-radius: 5px;
+ padding: 5px 10px;
+ margin: 8px 0;
+ font-size: 90%;
+ text-transform: uppercase; }
+ .flash-msg ul {
+ list-style-type: none;
+ padding: 0px; }
+
+.clear {
+ clear: both; }
+
+input[type="submit"] {
+ border-radius: 5px;
+ width: auto;
+ padding: 6px 10px;
+ background-color: #cd3301;
+ color: white;
+ border: none;
+ font-weight: bold;
+ text-transform: uppercase;
+ font-size: 85%; }
+ input[type="submit"]:hover {
+ background-color: #a62900;
+ cursor: pointer; }
@@ -1,19 +1,13 @@
/* application.scss */
$dark-gray: #454545;
$lite-gray: #d5d0cf;
+$off-white: #e4e3e3;
$gray: #7c7c7c;
-$teal: #47a19c;
-$dark-teal: #00a198;
$orange: #cd3301;
$dark-orange: #a62900;
$white: #ffffff;
-
-body {
- background-color: $lite-gray;
- color: $dark-gray;
- font-family: 'Open Sans', sans-serif;
-
-}
+$lite-purple: #410140;
+$purple: #310030;
#container {
margin: 80px auto 0 auto;
@@ -57,13 +51,13 @@ body {
#navigation {
ul {
float: right;
- margin-top: -2px;
+ margin-top: 6px;
margin-left: 0;
padding-left: 0;
display: inline;
li {
- padding: 0px 10px;
- border-left: 1px solid $dark-gray;
+ padding: 8px 10px 0px 10px;
+ border-left: 2px solid $gray;
list-style: none;
display: inline;
}
@@ -75,9 +69,6 @@ body {
#content {padding: 0 0 30px 0;}
-
-.clear {clear: both;}
-
.separator {
width: 100%;
margin: 0 auto;
@@ -138,11 +129,6 @@ label {
padding: 20px;
}
-#flash {
- .error { color: red; }
- .notice { color: $orange; }
-}
-
#add-seg {
width:500px;
float:left;
@@ -157,3 +143,17 @@ label {
#calendar-links{
margin-bottom:40px;
}
+input {
+ border: 1px;
+ font-family: 'Open Sans', sans-serif;
+ background-color: $off-white;
+ margin: 10px 5px 10px 5px;
+ border-radius: 3px;
+ padding: 3px;
+}
+
+.delete-button {
+ width: 80px;
+}
+
+
Oops, something went wrong.

0 comments on commit a0b8aa3

Please sign in to comment.