Summary Files Commits Branches @commit @diff @stats
path: root / src
diff options
context:
space:
mode:
8 files changed, 97 insertions, 24 deletions
-rw-r--r--src/buttons.less16
-rw-r--r--src/cards.less47
-rw-r--r--src/forms.less4
-rw-r--r--src/labels.less12
-rw-r--r--src/navigation.less4
-rw-r--r--src/tables.less2
-rw-r--r--src/tooltips.less18
-rw-r--r--src/typography.less18
diff --git a/src/buttons.less b/src/buttons.less
index ef95627..29c8e18 100644
--- a/src/buttons.less
+++ b/src/buttons.less
@@ -1,6 +1,5 @@
// Buttons
-.btn,
-button {
+.btn {
display: inline-block;
height: 3.2rem;
padding: .7rem 1.5rem;
@@ -53,7 +52,8 @@ button {
}
}
- &[disabled] {
+ &[disabled],
+ .disabled {
opacity: .5;
cursor: default;
}
@@ -169,12 +169,10 @@ button {
}
.btn-group {
- display: inline-block;
- vertical-align: middle;
- .clearfix();
+ display: inline-flex;
.btn {
- float: left;
+ flex: 1 0 auto;
&:first-child:not(:last-child) {
border-top-right-radius: 0;
@@ -192,4 +190,8 @@ button {
z-index: 99;
}
}
+
+ &.btn-group-block {
+ display: flex;
+ }
} \ No newline at end of file
diff --git a/src/cards.less b/src/cards.less
new file mode 100644
index 0000000..3a9abc5
--- /dev/null
+++ b/src/cards.less
@@ -0,0 +1,47 @@
+// Cards
+.card {
+ display: block;
+ text-align: left;
+ margin: 0;
+ padding: 0;
+ border-radius: .3rem;
+ background-color: #fff;
+ z-index: 999;
+ .shadow;
+
+ .card-header,
+ .card-image,
+ .card-content,
+ .card-footer {
+ padding: 1.5rem 1.5rem 0 1.5rem;
+
+ &:last-child {
+ padding-bottom: 1.5rem;
+ }
+ }
+ .card-image {
+ padding-left: 0;
+ padding-right: 0;
+
+ &:first-child {
+ padding-top: 0;
+
+ img {
+ border-top-left-radius: .3rem;
+ border-top-right-radius: .3rem;
+ }
+ }
+ }
+ .card-title {
+ margin-top: 0;
+ margin-bottom: .5rem;
+ font-size: 1.6em;
+ line-height: 1;
+ }
+ .card-meta {
+ margin-top: 0;
+ margin-bottom: 0;
+ font-size: 1em;
+ color: lighten(@body-font-color, 50%);
+ }
+} \ No newline at end of file
diff --git a/src/forms.less b/src/forms.less
index eaab29d..996056c 100644
--- a/src/forms.less
+++ b/src/forms.less
@@ -262,6 +262,10 @@
border-radius: .3rem;
background-color: @core-border-color;
}
+ .input-group-addon,
+ .input-group-btn {
+ flex: 1 0 auto;
+ }
.form-input,
.input-group-addon,
diff --git a/src/labels.less b/src/labels.less
index ac11630..1c16f40 100644
--- a/src/labels.less
+++ b/src/labels.less
@@ -1,15 +1,15 @@
// Labels
.label {
display: inline-block;
- padding: .3rem .5rem;
- font-size: 80%;
- line-height: 1;
- color: #666;
+ padding: .3rem .4rem;
+ font-size: 90%;
+ line-height: 1em;
+ color: lighten(@body-font-color, 25%);
background-color: @core-border-color;
text-align: center;
white-space: nowrap;
vertical-align: middle;
- margin: -.3rem .5rem 0 .5rem;
+ margin: -.3rem .1em 0 .1em;
border-radius: .2rem;
&.label-primary {
@@ -36,6 +36,6 @@
&.label-lg {
font-size: 100%;
line-height: 1.2;
- padding: .3rem .8rem;
+ padding: .3rem .5rem;
}
} \ No newline at end of file
diff --git a/src/navigation.less b/src/navigation.less
index 2e0436f..d119099 100644
--- a/src/navigation.less
+++ b/src/navigation.less
@@ -72,10 +72,8 @@
.tab-item {
float: none;
- flex: 1;
+ flex: 1 0 auto;
text-align: center;
}
}
}
-
-// TODO: Tabs with icons
diff --git a/src/tables.less b/src/tables.less
index 920f488..6ad7b93 100644
--- a/src/tables.less
+++ b/src/tables.less
@@ -1,5 +1,5 @@
// Tables
-table {
+.table {
width: 100%;
th,
diff --git a/src/tooltips.less b/src/tooltips.less
index 4d0f680..ab3e754 100644
--- a/src/tooltips.less
+++ b/src/tooltips.less
@@ -23,45 +23,49 @@
pointer-events: none;
transition: all .216s ease;
}
- &:hover {
+ &:hover,
+ &:focus {
&::after {
opacity: 1;
transform: translate(-50%, -.5rem);
}
}
- &[data-tooltip-pos="right"] {
+ &.tooltip-right {
&::after {
bottom: 50%;
left: 100%;
transform: translate(0, 50%);
}
- &:hover {
+ &:hover,
+ &:focus {
&::after {
transform: translate(.5rem, 50%);
}
}
}
- &[data-tooltip-pos="bottom"] {
+ &.tooltip-bottom {
&::after {
top: 100%;
bottom: auto;
transform: translate(-50%, 0);
}
- &:hover {
+ &:hover,
+ &:focus {
&::after {
transform: translate(-50%, .5rem);
}
}
}
- &[data-tooltip-pos="left"] {
+ &.tooltip-left {
&::after {
right: 100%;
bottom: 50%;
left: auto;
transform: translate(0, 50%);
}
- &:hover {
+ &:hover,
+ &:focus {
&::after {
transform: translate(-.5rem, 50%);
}
diff --git a/src/typography.less b/src/typography.less
index 94a596f..bd4c576 100644
--- a/src/typography.less
+++ b/src/typography.less
@@ -50,6 +50,24 @@ blockquote {
color: lighten(@body-font-color, 50%);
}
}
+code,
+pre {
+ display: block;
+ margin-top: 1em;
+ margin-bottom: 1em;
+ border-left: .2rem solid @core-color;
+ line-height: 1.8rem;
+ background-color: lighten(@core-border-color, 4%);
+}
+code {
+ padding: 1rem 2rem;
+}
+pre code {
+ background-color: transparent;
+ border-left: 0;
+ margin-top: 0;
+ margin-bottom: 0;
+}
ul,
ol {
margin: 0 0 1rem;