summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/wells.scss
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-11-21 22:06:11 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-11-21 22:06:11 +0800
commitb20c7846ffc0c78d6b483184363b6ccc7c11326d (patch)
tree05d232a4f877cd94481afcb8bf912410b58bbd0b /app/assets/stylesheets/framework/wells.scss
parentf593abbc70ab02823cd99d2db11598b629cbb3a0 (diff)
parent77a4382712888131813ec008a8d4179bcf753b8b (diff)
downloadgitlab-ce-b20c7846ffc0c78d6b483184363b6ccc7c11326d.tar.gz
Merge remote-tracking branch 'upstream/master' into show-commit-status-from-latest-pipeline
* upstream/master: (754 commits) Add documentation about todos and failed builds Add Changelog entry for failed builds todos fix Do not create TODO when build is allowed to fail Fix 404 on some group pages when name contains dot Grapify the users API Remove duplicate sidekiq throttling parameters Fix regression in Merge request form Fix wrong link Fix test Fix broken test Changes for stop url to path fix typo in gitlab_flow.md ('munch'->'much') Fix spec Backport some changes done from Time Tracking feature in EE. Use build instead create in BroadcastMessage model spec Try to fix tests Remove unnecessary self from user model Expose stop_path for environment to not construct that in frontend Bring back the `commit_url` as it's used by CycleAnalytics Add api endpoint for creating a pipeline ...
Diffstat (limited to 'app/assets/stylesheets/framework/wells.scss')
-rw-r--r--app/assets/stylesheets/framework/wells.scss45
1 files changed, 45 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
new file mode 100644
index 00000000000..192939f4527
--- /dev/null
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -0,0 +1,45 @@
+.info-well {
+ background: $background-color;
+ color: $gl-gray;
+ border: 1px solid $border-color;
+ border-radius: $border-radius-default;
+
+ .well-segment {
+ padding: $gl-padding;
+
+ &:not(:last-of-type) {
+ border-bottom: 1px solid $well-inner-border;
+ }
+
+ &.branch-info {
+ .monospace,
+ .commit-info {
+ margin-left: 4px;
+ }
+ }
+ }
+
+ .icon-container {
+ display: inline-block;
+ margin-right: 8px;
+
+ svg {
+ position: relative;
+ top: 2px;
+ height: 16px;
+ width: 16px;
+ }
+
+ &.commit-icon {
+ svg {
+ path {
+ fill: $gl-text-color;
+ }
+ }
+ }
+ }
+
+ .label.label-gray {
+ background-color: $well-expand-item;
+ }
+}