Skip to content
Permalink
Browse files

Merge PR #2498: GlobalShortcut, Themes: move hard-coded stylesheet fr…

…om GlobalShortcut.ui into the Themes class's default stylesheet.
  • Loading branch information...
mkrautz committed Aug 8, 2016
2 parents dab868e + 613b7fc commit 664ca408ba2f3d18d955ac4e3fe79ea0302b51f9
Showing with 1 addition and 8 deletions.
  1. +0 −7 src/mumble/GlobalShortcut.ui
  2. +1 −1 src/mumble/Themes.cpp
@@ -28,13 +28,6 @@
</property>
<item>
<widget class="QWidget" name="qwMacWarning" native="true">
<property name="styleSheet">
<string notr="true">#qwMacWarning {
background-color: #FFFEDC;
border-radius: 5px;
border: 1px solid #B5B59E;
}</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QLabel" name="label">
@@ -118,5 +118,5 @@ QVector<QDir> Themes::getSearchDirectories() {
}

QString Themes::getDefaultStylesheet() {
return QLatin1String(".log-channel{text-decoration:none;}.log-user{text-decoration:none;}p{margin:0;}");
return QLatin1String(".log-channel{text-decoration:none;}.log-user{text-decoration:none;}p{margin:0;}#qwMacWarning{background-color:#FFFEDC;border-radius:5px;border:1px solid #B5B59E;}");
}

0 comments on commit 664ca40

Please sign in to comment.
You can’t perform that action at this time.