Merge pull request #804 from HospitalRun/css-cleanup

Remove bootstrap theme file
HospitalRun · Nov 14, 2016 · ce4e660 · ce4e660
2 parents fc20566 + 6d8eedc
commit ce4e660
Show file tree

Hide file tree

Showing 8 changed files with 261 additions and 296 deletions.
diff --git a/app/styles/_bootstrap-theme.scss b/app/styles/_bootstrap-theme.scss
diff --git a/app/styles/_layout.scss b/app/styles/_layout.scss
@@ -18,7 +18,30 @@
   select { background: rgba($blue_light,.2); }
 }
 
-// ? unsure what below are for...
+.panel-default {
+  border: 0;
+  border-radius: 0;
+  background-color: transparent;
+
+  > {
+    .panel-heading {
+      border: 0;
+      border-radius: 0;
+      background-color: transparent;
+      padding: 0;
+      color: $navy;
+    }
+  }
+}
+
+.panel-heading {
+  border-radius: 3px;
+  background-color: $blue_light2;
+  padding: 10px 15px;
+  color: $navy;
+}
+
+// ? unsure what below are for...needs cleanup
 
 .detail-section-content {
   padding: 15px 0;

diff --git a/app/styles/app.scss b/app/styles/app.scss
@@ -1,7 +1,6 @@
 // Base styles
 @import 'variables_mixins';
 @import 'bootstrap';
-@import 'bootstrap-theme';
 @import 'typography';
 @import 'base';
 @import 'layout';
@@ -22,7 +21,9 @@
 @import 'basscss/typography';
 
 // Components
+@import 'components/alert';
 @import 'components/buttons';
+@import 'components/dropdown';
 @import 'components/form_styles';
 @import 'components/imaging';
 @import 'components/labs';
@@ -31,6 +32,7 @@
 @import 'components/panel';
 @import 'components/patient_history';
 @import 'components/patient_summary';
+@import 'components/progress-bar';
 @import 'components/sidebar_nav';
 @import 'components/tab_content';
 @import 'components/tab_nav';

diff --git a/app/styles/components/_alert.scss b/app/styles/components/_alert.scss
@@ -0,0 +1,30 @@
+.alert {
+  border: 0;
+  border-radius: 3px;
+  padding: 12px;
+}
+
+.alert-success {
+  border-color: #b2dba1;
+  background-image: linear-gradient(to bottom,#dff0d8 0%,#c8e5bc 100%);
+  background-repeat: repeat-x;
+}
+
+.alert-info {
+  border: 0;
+  box-shadow: none;
+  background: $alert_yellow;
+  text-shadow: none;
+  color: $alert_yellow_drk;
+}
+
+.alert-warning {
+  border-color: #f5e79e;
+  background-image: linear-gradient(to bottom,#fcf8e3 0%,#f8efc0 100%);
+  background-repeat: repeat-x;
+}
+
+.alert-danger {
+  background-color: $red_light;
+  color: $red_dark;
+}