Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Remove bootstrap theme file #804

Merged
merged 10 commits into from
Nov 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
294 changes: 0 additions & 294 deletions app/styles/_bootstrap-theme.scss

This file was deleted.

25 changes: 24 additions & 1 deletion app/styles/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion app/styles/app.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Base styles
@import 'variables_mixins';
@import 'bootstrap';
@import 'bootstrap-theme';
@import 'typography';
@import 'base';
@import 'layout';
Expand All @@ -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';
Expand All @@ -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';
Expand Down
30 changes: 30 additions & 0 deletions app/styles/components/_alert.scss
Original file line number Diff line number Diff line change
@@ -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;
}
Loading