Skip to content

Commit

Permalink
Auto-fix stylelint issues
Browse files Browse the repository at this point in the history
These `stylelint` issues were autofixed by the tool itself and look sane to me.
  • Loading branch information
jryans committed Jul 10, 2019
1 parent 4ebba43 commit dd2079b
Show file tree
Hide file tree
Showing 49 changed files with 143 additions and 162 deletions.
14 changes: 7 additions & 7 deletions res/css/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -209,25 +209,25 @@ textarea {

/* Expand thumbs on hoverover */
.gm-scrollbar {
border-radius: 5px ! important;
border-radius: 5px !important;
}
.gm-scrollbar.-vertical {
width: 6px;
transition: width 120ms ease-out ! important;
transition: width 120ms ease-out !important;
}
.gm-scrollbar.-vertical:hover,
.gm-scrollbar.-vertical:active {
width: 8px;
transition: width 120ms ease-out ! important;
transition: width 120ms ease-out !important;
}
.gm-scrollbar.-horizontal {
height: 6px;
transition: height 120ms ease-out ! important;
transition: height 120ms ease-out !important;
}
.gm-scrollbar.-horizontal:hover,
.gm-scrollbar.-horizontal:active {
height: 8px;
transition: height 120ms ease-out ! important;
transition: height 120ms ease-out !important;
}

// These are magic constants which are excluded from tinting, to let themes
Expand Down Expand Up @@ -390,7 +390,7 @@ textarea {

// flip colours for the secondary ones
font-weight: 600;
border: 1px solid $accent-color ! important;
border: 1px solid $accent-color !important;
color: $accent-color;
background-color: $button-secondary-bg-color;
}
Expand All @@ -407,7 +407,7 @@ textarea {
filter: brightness($focus-brightness);
}

.mx_Dialog button.mx_Dialog_primary, .mx_Dialog input[type="submit"].mx_Dialog_primary {
.mx_Dialog button.mx_Dialog_primary, .mx_Dialog input[type="submit"].mx_Dialog_primary {
color: $accent-fg-color;
background-color: $accent-color;
min-width: 156px;
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/context_menus/_RoomTileContextMenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ limitations under the License.
.mx_RoomTileContextMenu_tag_icon {
padding-right: 8px;
padding-left: 4px;
display: inline-block
display: inline-block;
}

.mx_RoomTileContextMenu_tag_icon_set {
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/context_menus/_TagTileContextMenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ limitations under the License.
.mx_TagTileContextMenu_item_icon {
padding-right: 8px;
padding-left: 4px;
display: inline-block
display: inline-block;
}

.mx_TagTileContextMenu_separator {
Expand Down
1 change: 0 additions & 1 deletion res/css/views/context_menus/_TopLeftMenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,4 @@ limitations under the License.
background-color: $menu-selected-color;
}
}

}
5 changes: 2 additions & 3 deletions res/css/views/dialogs/_AddressPickerDialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ limitations under the License.

/* Using a textarea for this element, to circumvent autofill */
.mx_AddressPickerDialog_input,
.mx_AddressPickerDialog_input:focus
{
.mx_AddressPickerDialog_input:focus {
height: 26px;
font-size: 14px;
font-family: $font-family;
Expand All @@ -36,7 +35,7 @@ limitations under the License.
}

.mx_AddressPickerDialog .mx_Dialog_content {
min-height: 50px
min-height: 50px;
}

.mx_AddressPickerDialog_inputContainer {
Expand Down
49 changes: 23 additions & 26 deletions res/css/views/dialogs/_DevtoolsDialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,11 @@ limitations under the License.
border-bottom: 1px solid #e5e5e5;
}

.mx_DevTools_inputRow
{
.mx_DevTools_inputRow {
display: table-row;
}

.mx_DevTools_inputLabelCell
{
.mx_DevTools_inputLabelCell {
display: table-cell;
font-weight: bold;
padding-right: 24px;
Expand All @@ -62,8 +60,7 @@ limitations under the License.
width: 240px;
}

.mx_DevTools_inputCell input
{
.mx_DevTools_inputCell input {
display: inline-block;
border: 0;
border-bottom: 1px solid $input-underline-color;
Expand Down Expand Up @@ -95,11 +92,11 @@ limitations under the License.

// add default box-sizing for this scope
&,
&:after,
&:before,
&::after,
&::before,
& *,
& *:after,
& *:before,
& *::after,
& *::before,
& + .mx_DevTools_tgl-btn {
box-sizing: border-box;
&::selection {
Expand All @@ -115,25 +112,25 @@ limitations under the License.
position: relative;
cursor: pointer;
user-select: none;
&:after,
&:before {
&::after,
&::before {
position: relative;
display: block;
content: "";
width: 50%;
height: 100%;
}

&:after {
&::after {
left: 0;
}

&:before {
&::before {
display: none;
}
}

&:checked + .mx_DevTools_tgl-btn:after {
&:checked + .mx_DevTools_tgl-btn::after {
left: 50%;
}
}
Expand All @@ -144,8 +141,8 @@ limitations under the License.
transition: all .2s ease;
font-family: sans-serif;
perspective: 100px;
&:after,
&:before {
&::after,
&::before {
display: inline-block;
transition: all .4s ease;
width: 100%;
Expand All @@ -160,34 +157,34 @@ limitations under the License.
border-radius: 4px;
}

&:after {
&::after {
content: attr(data-tg-on);
background: #02C66F;
background: #02c66f;
transform: rotateY(-180deg);
}

&:before {
background: #FF3A19;
&::before {
background: #ff3a19;
content: attr(data-tg-off);
}

&:active:before {
&:active::before {
transform: rotateY(-20deg);
}
}

&:checked + .mx_DevTools_tgl-btn {
&:before {
&::before {
transform: rotateY(180deg);
}

&:after {
&::after {
transform: rotateY(0);
left: 0;
background: #7FC6A6;
background: #7fc6a6;
}

&:active:after {
&:active::after {
transform: rotateY(20deg);
}
}
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/dialogs/_GroupAddressPicker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_GroupAddressPicker_checkboxContainer{
.mx_GroupAddressPicker_checkboxContainer {
margin-top: 10px;
display: flex;
}
Expand Down
8 changes: 4 additions & 4 deletions res/css/views/dialogs/_RoomSettingsDialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ limitations under the License.
// ICONS
// ==========================================================

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

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

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

.mx_RoomSettingsDialog_warningIcon:before {
.mx_RoomSettingsDialog_warningIcon::before {
mask-image: url('$(res)/img/feather-customised/warning-triangle.svg');
}

Expand Down
16 changes: 8 additions & 8 deletions res/css/views/dialogs/_UserSettingsDialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,34 +17,34 @@ limitations under the License.
// ICONS
// ==========================================================

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

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

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

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

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

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

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

.mx_UserSettingsDialog_flairIcon:before {
.mx_UserSettingsDialog_flairIcon::before {
mask-image: url('$(res)/img/feather-customised/flair.svg');
}
4 changes: 2 additions & 2 deletions res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ limitations under the License.
}

.mx_CreateKeyBackupDialog_primaryContainer {
/*FIXME: plinth colour in new theme(s). background-color: $accent-color;*/
padding: 20px
/* FIXME: plinth colour in new theme(s). background-color: $accent-color; */
padding: 20px;
}

.mx_CreateKeyBackupDialog_primaryContainer::after {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ limitations under the License.
padding-left: 45px;
padding-bottom: 10px;

&:before {
&::before {
mask: url("$(res)/img/e2e/lock-warning-filled.svg");
mask-repeat: no-repeat;
background-color: $primary-fg-color;
Expand Down
6 changes: 3 additions & 3 deletions res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_RestoreKeyBackupDialog_primaryContainer {
/*FIXME: plinth colour in new theme(s). background-color: $accent-color;*/
padding: 20px
/* FIXME: plinth colour in new theme(s). background-color: $accent-color; */
padding: 20px;
}

.mx_RestoreKeyBackupDialog_passPhraseInput,
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/directory/_NetworkDropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ limitations under the License.
position: absolute;
right: 10px;
top: 16px;
width: 0
width: 0;
}

.mx_NetworkDropdown_networkoption {
Expand Down
6 changes: 3 additions & 3 deletions res/css/views/elements/_AddressSelector.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ limitations under the License.
width: 485px;
max-height: 116px;
overflow-y: auto;
border-radius: 3px;
background-color: $primary-bg-color;
border: solid 1px $accent-color;
border-radius: 3px;
background-color: $primary-bg-color;
border: solid 1px $accent-color;
cursor: pointer;
}

Expand Down
4 changes: 2 additions & 2 deletions res/css/views/elements/_ImageView.scss
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ limitations under the License.
}

.mx_ImageView_link {
color: $lightbox-fg-color ! important;
text-decoration: none ! important;
color: $lightbox-fg-color !important;
text-decoration: none !important;
}

.mx_ImageView_button {
Expand Down
6 changes: 3 additions & 3 deletions res/css/views/elements/_RichText.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}

.mx_UserPill_selected {
background-color: $accent-color ! important;
background-color: $accent-color !important;
}

/* More specific to override `.markdown-body a` color */
Expand Down Expand Up @@ -79,15 +79,15 @@

.mx_Markdown_ITALIC {
font-style: italic;
/*
/*
// interestingly, *not* using the explicit italic font
// variant seems yield better results.
// compensate for Nunito italics being terrible
// https://github.com/google/fonts/issues/1726
transform: skewX(-14deg);
display: inline-block;
*/
*/
}

.mx_Markdown_CODE {
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/elements/_Spinner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ limitations under the License.

.mx_MatrixChat_middlePanel .mx_Spinner {
height: auto;
}
}
Loading

0 comments on commit dd2079b

Please sign in to comment.