app/assets/stylesheets/bootstrap-overrides.css in artfully_ose-1.1.0 vs app/assets/stylesheets/bootstrap-overrides.css in artfully_ose-1.2.0.alpha.1

- old
+ new

@@ -43,10 +43,15 @@ text-indent: 5000px; display: block; width: 85px; } +.navbar .brand { + color: #fff; + text-shadow: none; +} + .navbar .divider-vertical { background-color: #175c71; border-color: #2086a6; } @@ -61,11 +66,10 @@ background-repeat: no-repeat; background-position: 0px center; padding-top: 9px; padding-bottom: 11px; padding-left: 95px; - width: 1030px; } .feedback-footer .navbar-inner a { font-weight: normal; color: #2086a6; @@ -73,10 +77,23 @@ #feedback-modal, #feedback-modal .modal-footer { text-align:center; } +.modal .modal-body textarea.block { + width: 520px; + display: block; +} + +.modal > form { + margin-bottom: 0; +} + +.modal-footer div { + display: inline; +} + body { padding-top: 60px; } section { @@ -123,40 +140,40 @@ color: #999; } /* Accordian Menu used on events#edit */ -.nav-accordian{ +.nav-accordion{ *zoom: 1; } -.nav-accordian:before, -.nav-accordian:after { +.nav-accordion:before, +.nav-accordion:after { display: table; content: ""; } -.nav-accordian:after { +.nav-accordion:after { clear: both; } -.nav-accordian { +.nav-accordion { border-bottom: 0; background: #F7F7F9; } -.nav-accordian > li{ +.nav-accordion > li{ margin-bottom: -1px; } -.nav-accordian > .active > a, -.nav-accordian > .active > a:hover { +.nav-accordion > .active > a, +.nav-accordion > .active > a:hover { color: #555555; background-color: #ffffff; border: 1px solid #ddd; cursor: default; } -.nav-accordian > li > a:hover { +.nav-accordion > li > a:hover { border-color: #ddd; z-index: 2; } -.nav-accordian > li > a { +.nav-accordion > li > a { color: #175d73; margin-right: 0; padding-top: 8px; padding-bottom: 8px; padding-right: 12px; @@ -166,74 +183,76 @@ -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; position: relative; } -.nav-accordian > li:first-child > a { +.nav-accordion > li:first-child > a { -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } -.nav-accordian > li:last-child > a { +.nav-accordion > li:last-child > a { -webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } -.nav-accordian > li.accordian { +.nav-accordion > li.accordion { } -.nav-accordian > li.accordian > .accordian-menu { +.nav-accordion > li.accordion > .accordion-menu { margin-bottom: 0; background: #fff; display: none; } -.nav-accordian > li.accordian.active > .accordian-menu { +.nav-accordion > li.accordion.active > .accordion-menu { display: block; } -.accordian-menu > li { + +#event-accordion .accordion-inner { + padding: 0px; +} +.accordion-menu > li { } -.accordian-menu > li > a { +.accordion-menu > li > a { font-weight: normal; display: block; position: relative; color: #175d73; margin-right: 0; padding-top: 8px; padding-bottom: 8px; padding-right: 12px; padding-left: 24px; line-height: 18px; - border-left: 1px solid #ddd; - border-right: 1px solid #ddd; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.accordian-menu > li > a:hover { +.accordion-menu > li > a:hover { background: #F5F5F5; text-decoration: none; z-index: 2; } -.accordian-menu > li > a.add { +.accordion-menu > li > a.add { background: none; } -.accordian-menu > li > a.add:hover { +.accordion-menu > li > a.add:hover { background: #F5F5F5; text-decoration: none; z-index: 2; } -.accordian-menu > .active > a, -.accordian-menu > .active > a:hover { +.accordion-menu > .active > a, +.accordion-menu > .active > a:hover { color: #fff; background-color: #175d73; border: 1px solid #175d73; border-bottom-color: transparent; cursor: default; } -.nav-accordian > li:last-child > .accordian-menu > li:last-child > a { +.nav-accordion > li:last-child > .accordion-menu > li:last-child > a { border-bottom: 1px solid #ddd; -webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } @@ -264,10 +283,21 @@ .btn-primary:active, .btn-primary.active { background-color: #004099 \9; } +.btn-signup { + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-size: 16px; + font-weight: 300; + line-height: 2.5em; +} + +.btn-signup.btn-notprimary{ + font-weight: 400; +} + .form-vertical .input-append, .form-vertical .input-prepend, .form-vertical .input-prepend input { display: inline-block; margin-bottom: 0; @@ -302,6 +332,50 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="button"].btn-block { width: 100%; +} + +.btn-group { + margin-bottom: 9px; +} + +.dropdown .dropdown-menu .disabled, +.dropdown .dropdown-menu .disabled:visited , +.dropdown .dropdown-menu .disabled:active, +.dropdown .dropdown-menu .disabled:hover { + background-color: #efefef !important; + color: #7B7B7B !important; + cursor: default; +} + +h6 { + font-size: 11px; + color: #999999; + text-transform: uppercase; + margin: 0; +} + +/* + * Changing baseFontSize 13px left the radio buttons and checkboxes a bit out of wack + */ +input[type="radio"], input[type="checkbox"] { + margin: 1px 0 0; + line-height: normal; +} + +.navbar .nav>li>a { + text-shadow: 0 -1px 0 rgba(0,0,0,0.25); +} + +.navbar .nav>li>a:hover { + color: white; +} + +#day-date .navbar-inner { + min-height: 0px; +} + +[class^="icon-"],[class*=" icon-"] { + background-image:url("/assets/glyphicons-halflings.png") !important }