summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/profile.scss
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets/pages/profile.scss')
-rw-r--r--app/assets/stylesheets/pages/profile.scss67
1 files changed, 64 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index de4d9fd80fa..4826b994e37 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -5,12 +5,24 @@
}
}
-.profile-avatar-form-option {
- hr {
- margin: 10px 0;
+.avatar-image {
+ @media (min-width: $screen-sm-min) {
+ float: left;
+ margin-bottom: 0;
}
}
+.avatar-file-name {
+ position: relative;
+ top: 2px;
+ display: inline-block;
+}
+
+.account-btn-link,
+.profile-settings-sidebar a {
+ color: $profile-settings-link-color;
+}
+
.oauth-buttons {
.btn-group {
margin-right: 10px;
@@ -42,6 +54,18 @@
}
}
+.account-well {
+ padding: 10px 10px;
+ background-color: $help-well-bg;
+ border: 1px solid $help-well-border;
+ border-radius: $border-radius-base;
+
+ ul {
+ padding-left: 20px;
+ margin-bottom: 0;
+ }
+}
+
.calendar-hint {
margin-top: -12px;
float: right;
@@ -79,6 +103,13 @@
margin: auto;
}
+.user-avatar-button {
+ .file-name {
+ display: inline-block;
+ padding-left: 10px;
+ }
+}
+
.modal-profile-crop {
.modal-dialog {
width: 500px;
@@ -114,3 +145,33 @@
width: auto;
}
}
+
+.key-list-item {
+ .key-list-item-info {
+ @media (min-width: $screen-sm-min) {
+ float: left;
+ }
+ }
+
+ .description {
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+}
+
+.key-icon {
+ color: $ssh-key-icon-color;
+ font-size: $ssh-key-icon-size;
+ line-height: 42px;
+}
+
+.key-created-at {
+ line-height: 42px;
+}
+
+.profile-settings-content {
+ a {
+ color: $profile-settings-link-color;
+ }
+}