Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix indentation on all new settings CSS #2528

Merged
merged 1 commit into from
Jan 30, 2019
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
88 changes: 44 additions & 44 deletions res/css/structures/_TabbedView.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,79 +16,79 @@ limitations under the License.
*/

.mx_TabbedView {
margin: 0;
padding: 0;
display: flex;
width: 100%;
height: 100%;
margin: 0;
padding: 0;
display: flex;
width: 100%;
height: 100%;
}

.mx_TabbedView_tabLabels {
width: 150px;
max-width: 150px;
height: 100%;
color: $tab-label-fg-color;
width: 150px;
max-width: 150px;
height: 100%;
color: $tab-label-fg-color;
}

.mx_TabbedView_tabLabel {
vertical-align: text-top;
cursor: pointer;
display: block;
border-radius: 3px;
font-size: 12px;
font-weight: 600;
min-height: 20px; // use min-height instead of height to allow the label to overflow a bit
margin-bottom: 6px;
position: relative;
vertical-align: text-top;
cursor: pointer;
display: block;
border-radius: 3px;
font-size: 12px;
font-weight: 600;
min-height: 20px; // use min-height instead of height to allow the label to overflow a bit
margin-bottom: 6px;
position: relative;
}

.mx_TabbedView_tabLabel_active {
background-color: $tab-label-active-bg-color;
color: $tab-label-active-fg-color;
background-color: $tab-label-active-bg-color;
color: $tab-label-active-fg-color;
}

// TODO: Remove temporary hack alongside "visit old settings" tab
.mx_TabbedView_tabLabel_TEMP_HACK {
background-color: orange;
background-color: orange;
}

.mx_TabbedView_maskedIcon {;
margin-left: 6px;
margin-right: 9px;
margin-top: 1px;
width: 14px;
height: 14px;
display: inline-block;
margin-left: 6px;
margin-right: 9px;
margin-top: 1px;
width: 14px;
height: 14px;
display: inline-block;
}

.mx_TabbedView_maskedIcon:before {
display: inline-block;
background-color: $tab-label-icon-bg-color;
mask-repeat: no-repeat;
mask-size: 14px;
width: 14px;
height: 18px;
mask-position: center;
content: '';
vertical-align: middle;
display: inline-block;
background-color: $tab-label-icon-bg-color;
mask-repeat: no-repeat;
mask-size: 14px;
width: 14px;
height: 18px;
mask-position: center;
content: '';
vertical-align: middle;
}

.mx_TabbedView_tabLabel_active .mx_TabbedView_maskedIcon:before {
background-color: $tab-label-active-icon-bg-color;
background-color: $tab-label-active-icon-bg-color;
}

.mx_TabbedView_tabLabel_text {
vertical-align: middle;
vertical-align: middle;
}

.mx_TabbedView_tabPanel {
width: calc(100% - 320px);
display: inline-block;
margin-left: 70px;
flex-grow: 1;
width: calc(100% - 320px);
display: inline-block;
margin-left: 70px;
flex-grow: 1;
}

.mx_TabbedView_tabPanelContent {
flex-grow: 1;
min-width: 560px;
flex-grow: 1;
min-width: 560px;
}
8 changes: 4 additions & 4 deletions res/css/views/dialogs/_RoomSettingsDialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ limitations under the License.
// ==========================================================

.mx_RoomSettingsDialog_settingsIcon:before {
mask-image: url('$(res)/img/feather-icons/settings.svg');
mask-image: url('$(res)/img/feather-icons/settings.svg');
}

.mx_RoomSettingsDialog_securityIcon:before {
mask-image: url('$(res)/img/feather-icons/lock.svg');
mask-image: url('$(res)/img/feather-icons/lock.svg');
}

.mx_RoomSettingsDialog_rolesIcon:before {
mask-image: url('$(res)/img/feather-icons/users-sm.svg');
mask-image: url('$(res)/img/feather-icons/users-sm.svg');
}

.mx_RoomSettingsDialog_warningIcon:before {
mask-image: url('$(res)/img/feather-icons/warning-triangle.svg');
mask-image: url('$(res)/img/feather-icons/warning-triangle.svg');
}
16 changes: 8 additions & 8 deletions res/css/views/dialogs/_UserSettingsDialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,33 @@ limitations under the License.
// ==========================================================

.mx_UserSettingsDialog_settingsIcon:before {
mask-image: url('$(res)/img/feather-icons/settings.svg');
mask-image: url('$(res)/img/feather-icons/settings.svg');
}

.mx_UserSettingsDialog_voiceIcon:before {
mask-image: url('$(res)/img/feather-icons/phone.svg');
mask-image: url('$(res)/img/feather-icons/phone.svg');
}

.mx_UserSettingsDialog_bellIcon:before {
mask-image: url('$(res)/img/feather-icons/notifications.svg');
mask-image: url('$(res)/img/feather-icons/notifications.svg');
}

.mx_UserSettingsDialog_preferencesIcon:before {
mask-image: url('$(res)/img/feather-icons/sliders.svg');
mask-image: url('$(res)/img/feather-icons/sliders.svg');
}

.mx_UserSettingsDialog_securityIcon:before {
mask-image: url('$(res)/img/feather-icons/lock.svg');
mask-image: url('$(res)/img/feather-icons/lock.svg');
}

.mx_UserSettingsDialog_helpIcon:before {
mask-image: url('$(res)/img/feather-icons/help-circle.svg');
mask-image: url('$(res)/img/feather-icons/help-circle.svg');
}

.mx_UserSettingsDialog_labsIcon:before {
mask-image: url('$(res)/img/feather-icons/flag.svg');
mask-image: url('$(res)/img/feather-icons/flag.svg');
}

.mx_UserSettingsDialog_flairIcon:before {
mask-image: url('$(res)/img/feather-icons/flair.svg');
mask-image: url('$(res)/img/feather-icons/flair.svg');
}
20 changes: 10 additions & 10 deletions res/css/views/settings/_EmailAddresses.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,29 @@ limitations under the License.
*/

.mx_ExistingEmailAddress {
margin-bottom: 5px;
margin-bottom: 5px;
}

.mx_ExistingEmailAddress_delete {
margin-right: 5px;
cursor: pointer;
vertical-align: middle;
margin-right: 5px;
cursor: pointer;
vertical-align: middle;
}

.mx_ExistingEmailAddress_email {
vertical-align: middle;
vertical-align: middle;
}

.mx_ExistingEmailAddress_promptText {
margin-right: 10px;
margin-right: 10px;
}

.mx_ExistingEmailAddress_confirmBtn {
margin-right: 5px;
margin-right: 5px;
}

.mx_EmailAddresses_new .mx_Field input {
// Use 100% of the space available for the input, but don't let the 10px
// padding on either side of the input to push it out of alignment.
width: calc(100% - 20px);
// Use 100% of the space available for the input, but don't let the 10px
// padding on either side of the input to push it out of alignment.
width: calc(100% - 20px);
}
28 changes: 14 additions & 14 deletions res/css/views/settings/_PhoneNumbers.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,42 @@ limitations under the License.
*/

.mx_ExistingPhoneNumber {
margin-bottom: 5px;
margin-bottom: 5px;
}

.mx_ExistingPhoneNumber_delete {
margin-right: 5px;
cursor: pointer;
vertical-align: middle;
margin-right: 5px;
cursor: pointer;
vertical-align: middle;
}

.mx_ExistingPhoneNumber_address {
vertical-align: middle;
vertical-align: middle;
}

.mx_ExistingPhoneNumber_promptText {
margin-right: 10px;
margin-right: 10px;
}

.mx_ExistingPhoneNumber_confirmBtn {
margin-right: 5px;
margin-right: 5px;
}

.mx_PhoneNumbers_new .mx_Field input {
// Use 100% of the space available for the input, but don't let the 10px
// padding on either side of the input to push it out of alignment.
width: calc(100% - 20px);
// Use 100% of the space available for the input, but don't let the 10px
// padding on either side of the input to push it out of alignment.
width: calc(100% - 20px);
}

.mx_PhoneNumbers_input {
display: flex;
align-items: center;
display: flex;
align-items: center;
}

.mx_PhoneNumbers_input > .mx_Field {
flex-grow: 1;
flex-grow: 1;
}

.mx_PhoneNumbers_country {
width: 80px;
width: 80px;
}
Loading