Skip to content

Commit

Permalink
fix(VS15, Skyrim) Selected mod esp highlight
Browse files Browse the repository at this point in the history
-  Update fix for broken padding on list/tree items. At the moment only QListWidget items need the fix. It fixes missing selected plugin's esp highlight when a plugin is selected on the main list
- [VS15] Add padding  for 'Archives' and 'Data' tabs' items
- Remove useless comments
  • Loading branch information
nikolay-borzov committed Nov 2, 2018
1 parent 8907558 commit 66d2bc9
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 49 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ npm run watch -- --theme=vs15 --dest="C:\Games\Mod Organizer 2\stylesheets"
# Other

## Resources
* [Qt Documentation](http://doc.qt.io/qt-4.8/stylesheet-examples.html)
* [Qt Documentation - The Style Sheet Syntax](http://doc.qt.io/qt-5/stylesheet-syntax.html)
* [StackOverflow](http://stackoverflow.com/)
* Mod Organizer source code

Expand Down
2 changes: 1 addition & 1 deletion themes/skyrim/sass/_version.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Skyrim
****************************************
Author: chintsu_kun
Version: 2.0.0
Version: 2.0.1
Licence: GNU General Public License v3.0 (https://www.gnu.org/licenses/gpl-3.0.en.html)
Url: https://github.com/nikolay-borzov/modorganizer-themes
****************************************
Expand Down
9 changes: 4 additions & 5 deletions themes/skyrim/sass/skyrim.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ QWidget {

/* Common */

/* fix: fo some reason applying background-color or border fixes paddings properties */
QListView::item,
QTreeView#espList::item,
QTreeWidget#categoriesList::item {
/* FIX: For some reason applying background-color or border fixes paddings
properties */
QListWidget::item {
border-width: 0;
}

Expand Down Expand Up @@ -200,7 +199,7 @@ QLineEdit {
}
}

/* Dropdowns #QComboBox*/
/* Drop-downs #QComboBox*/
QComboBox {
min-height: 20px;
padding-left: 5px;
Expand Down
28 changes: 15 additions & 13 deletions themes/vs15/sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ QMainWindow::separator { }

/* Common */

/* FIX: For some reason applying background-color or border fixes paddings properties */
QListView::item,
QTreeView#espList::item,
QTreeWidget#categoriesList::item {
/* FIX: For some reason applying background-color or border fixes paddings
properties. Otherwise padding is only applied when item is hovered */
QListWidget::item {
border-width: 0;
}

Expand All @@ -31,15 +30,18 @@ QListView::item:disabled,


/* line heights */
/* QTreeView#fileTree::item - currently have problem with size column vertical text align */
/* QTreeView#fileTree::item - currently have problem with size column vertical
text align */
#bsaList::item, /* Archives */
#dataTree::item, /* Data */
QTreeView#modList::item,
QTreeWidget#categoriesTree::item,
#tabConflicts QTreeWidget::item {
padding: $tree-item-padding;
}

QListView::item,
QTreeView#espList::item {
QTreeView#espList::item /* Plugins */ {
padding: $list-item-padding;
}

Expand Down Expand Up @@ -171,7 +173,7 @@ QLineEdit#espFilterEdit QToolButton {
margin-bottom: 1px;
}

/* Dropdowns #QComboBox*/
/* Drop-downs #QComboBox*/

QComboBox {
min-height: 20px;
Expand All @@ -192,7 +194,7 @@ QComboBox {
subcontrol-position: top right;
border: none;

/* If you need to set style for drop down button
/* If you need to set style for drop-down button
&:on,
&:editable:hover {
background-color: red;
Expand Down Expand Up @@ -365,8 +367,8 @@ QDialog QPushButton {
padding-right: .5em;
}

/* Checkboxes and Radio buttons common #QCheckBox, #QRadioButton */
/*common*/
/* Check boxes and Radio buttons common #QCheckBox, #QRadioButton */
/* common */
QGroupBox::indicator,
QTreeView::indicator,
QCheckBox::indicator,
Expand Down Expand Up @@ -403,7 +405,7 @@ QCheckBox::indicator:checked:disabled {
image: url(./vs15/checkbox-check-disabled.png);
}

/* Checkboxes special */
/* Check boxes special */

QTreeView#modList::indicator {
width: $treeview-checkbox-width;
Expand Down Expand Up @@ -679,7 +681,7 @@ QHeaderView::down-arrow {
margin-bottom: 0;
}

/* Context menus, toolbar dropdowns #QMenu */
/* Context menus, toolbar drop-downs #QMenu */

QMenu {
background-color: $color-context-menu-background;
Expand Down Expand Up @@ -929,7 +931,7 @@ QWidget#bsaTab QTreeWidget::indicator:unchecked {
background-color: $color-selected-background;
}

/* increase version textfield */
/* increase version text field */
QLineEdit#versionEdit {
max-width: 100px;
}
Expand Down
2 changes: 1 addition & 1 deletion themes/vs15/sass/_dark-base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ $color-text: #F1F1F1;
$color-text-disabled: #656565;
$color-border: #3F3F46;

$color-input-border: #3F3F46; /* or #434346*/
$color-input-border: #3F3F46;
$color-input-background: #333337;
$color-input-background-hover: #3F3F46;

Expand Down
7 changes: 0 additions & 7 deletions themes/vs15/sass/_dark-blue.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,14 @@ $color-selected-background-disabled: #202A34;
$color-input-border-hover: #007ACC;
$color-input-border-focus: #3399FF;

/*$color-text-box-border-focus: #3399FF; = $color-input-border-focus*/
/*$color-text-box-border-hover: #007ACC; = $color-input-border-hover*/

$color-tool-button-pressed-background: #3399FF;

/*$color-combo-box-hover-border: #007ACC;*/

$color-button-hover-background: #007ACC;
$color-button-pressed-background: #1C97EA;

$color-dialog-button-background-hover: #BEE6FD;
$color-dialog-button-border-hover: #3C7FB1;
$color-dialog-button-border-focus: #3399FF;

/*$color-check-box-hover-border: #007ACC; = $color-input-border-hover*/

$color-tab-selected-background: #007ACC;
$color-tab-hover-background: #1C97EA;
10 changes: 5 additions & 5 deletions themes/vs15/sass/_dark-orange.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*base*/
$color-theme-1: #CC6600 /*#3399FF*/;
$color-theme-2: $color-theme-1/*#007ACC*/;
$color-theme-3: lighten($color-theme-1, 5%)/*#1C97EA*/;
$color-theme-4: lighten($color-theme-1, 3%)/*#3C7FB1*/;
$color-theme-5: lighten($color-theme-1, 45%)/*#BEE6FD*/;
$color-theme-1: #CC6600;
$color-theme-2: $color-theme-1;
$color-theme-3: lighten($color-theme-1, 5%);
$color-theme-4: lighten($color-theme-1, 3%);
$color-theme-5: lighten($color-theme-1, 45%);

$color-selected-background-disabled: darken($color-theme-1, 30%);

Expand Down
10 changes: 5 additions & 5 deletions themes/vs15/sass/_dark-purple.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*base*/
$color-theme-1: #7E2AD2 /*#3399FF*/;
$color-theme-2: $color-theme-1/*#007ACC*/;
$color-theme-3: lighten($color-theme-1, 5%)/*#1C97EA*/;
$color-theme-4: lighten($color-theme-1, 3%)/*#3C7FB1*/;
$color-theme-5: lighten($color-theme-1, 40%)/*#BEE6FD*/;
$color-theme-1: #7E2AD2;
$color-theme-2: $color-theme-1;
$color-theme-3: lighten($color-theme-1, 5%);
$color-theme-4: lighten($color-theme-1, 3%);
$color-theme-5: lighten($color-theme-1, 40%);

$color-selected-background-disabled: darken($color-theme-1, 30%);

Expand Down
10 changes: 5 additions & 5 deletions themes/vs15/sass/_dark-red.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*base*/
$color-theme-1: #990000 /*#3399FF*/;
$color-theme-2: $color-theme-1/*#007ACC*/;
$color-theme-3: lighten($color-theme-1, 5%)/*#1C97EA*/;
$color-theme-4: lighten($color-theme-1, 3%)/*#3C7FB1*/;
$color-theme-5: lighten($color-theme-1, 60%)/*#BEE6FD*/;
$color-theme-1: #990000;
$color-theme-2: $color-theme-1;
$color-theme-3: lighten($color-theme-1, 5%);
$color-theme-4: lighten($color-theme-1, 3%);
$color-theme-5: lighten($color-theme-1, 60%);

$color-selected-background-disabled: darken($color-theme-1, 30%);

Expand Down
10 changes: 5 additions & 5 deletions themes/vs15/sass/_dark-yellow.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*base*/
$color-theme-1: #9A9A00 /*#3399FF*/;
$color-theme-2: $color-theme-1/*#007ACC*/;
$color-theme-3: lighten($color-theme-1, 5%)/*#1C97EA*/;
$color-theme-4: lighten($color-theme-1, 3%)/*#3C7FB1*/;
$color-theme-5: lighten($color-theme-1, 65%)/*#BEE6FD*/;
$color-theme-1: #9A9A00;
$color-theme-2: $color-theme-1;
$color-theme-3: lighten($color-theme-1, 5%);
$color-theme-4: lighten($color-theme-1, 3%);
$color-theme-5: lighten($color-theme-1, 65%);

$color-selected-background-disabled: darken($color-theme-1, 30%);

Expand Down
2 changes: 1 addition & 1 deletion themes/vs15/sass/_version.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
VS15 Dark
****************************************
Author: chintsu_kun
Version: 1.3.1
Version: 2.0.1
Licence: GNU General Public License v3.0 (https://www.gnu.org/licenses/gpl-3.0.en.html)
Url: https://github.com/nikolay-borzov/modorganizer-themes
****************************************
Expand Down

0 comments on commit 66d2bc9

Please sign in to comment.