Using proper font classes

diff --git a/wcfsetup/install/files/style/layout/form.scss b/wcfsetup/install/files/style/layout/form.scss
index 620199d8b4388e7a76ad9e2a5094f8015621e9e0..fe4062a3ea51bf560541a5121f82afb171a64c73 100644 (file)
--- a/wcfsetup/install/files/style/layout/form.scss
+++ b/wcfsetup/install/files/style/layout/form.scss
@@ -142,7 +142,7 @@ dl {
        }
        
        &.inlineDataList {
-               font-size: .85rem;
+               @extend .wcfFontSmall;
                
                > dt {
                        display: inline-block;
@@ -172,11 +172,12 @@ dl {
                > dt {
                        color: $wcfDimmedColor;
                        flex: 0 0 60%;
-                       font-size: .85rem;
                        margin-left: 5px;
                        overflow: hidden;
                        text-align: left;
                        white-space: nowrap;
+                       
+                       @extend .wcfFontSmall;
                }
                
                > dd {

diff --git a/wcfsetup/install/files/style/layout/pageFooter.scss b/wcfsetup/install/files/style/layout/pageFooter.scss
index 05e153a3dbfa7a993d6bfafc4916bd0d2b22dc5f..85fc4283c507a3b1a306538860d3b9296cc24a02 100644 (file)
--- a/wcfsetup/install/files/style/layout/pageFooter.scss
+++ b/wcfsetup/install/files/style/layout/pageFooter.scss
@@ -36,9 +36,9 @@
                        }
                        
                        > div > .containerHeadline > h3 {
-                               font-family: "Segoe UI Light";
-                               font-size: 1.4rem;
                                margin-bottom: 10px;
+                               
+                               @extend .wcfFontHeadline;
                        }
                }
        }

diff --git a/wcfsetup/install/files/style/layout/pageHeader.scss b/wcfsetup/install/files/style/layout/pageHeader.scss
index a768d74fd8eadeb39bbb2e8c7657d24473763658..a1b02437edcebceb714e4575f55bb377795049c3 100644 (file)
--- a/wcfsetup/install/files/style/layout/pageHeader.scss
+++ b/wcfsetup/install/files/style/layout/pageHeader.scss
@@ -123,13 +123,12 @@
        
        > li {
                > a {
-                       @extend .wcfFontDefault;
-                       
                        color: $wcfHeaderMenuLink;
                        display: block;
-                       font-size: 1rem;
                        padding: 5px 20px;
                        white-space: nowrap;
+                       
+                       @extend .wcfFontDefault;
                }
                
                &.active > a,

diff --git a/wcfsetup/install/files/style/layout/sidebar.scss b/wcfsetup/install/files/style/layout/sidebar.scss
index dc207e158dee67fc40e5e3feab4d76db5d7339c2..441644128eb89054ac8b6898b17aba18fde80e06 100644 (file)
--- a/wcfsetup/install/files/style/layout/sidebar.scss
+++ b/wcfsetup/install/files/style/layout/sidebar.scss
@@ -78,8 +78,9 @@
        }
        
        dl.dataList {
-               font-size: .85rem;
                overflow: hidden;
+               
+               @extend .wcfFontSmall;
        }
        
        dl:not(.dataList) {

diff --git a/wcfsetup/install/files/style/ui/breadcrumb.scss b/wcfsetup/install/files/style/ui/breadcrumb.scss
index 4fa8d27e763286058353cfd47f712c0a341d5260..673ff2a3a2792057499c843602183e078f4961cc 100644 (file)
--- a/wcfsetup/install/files/style/ui/breadcrumb.scss
+++ b/wcfsetup/install/files/style/ui/breadcrumb.scss
@@ -6,7 +6,8 @@
                
                > li {
                        flex: 0 auto;
-                       font-size: .85rem;
+                       
+                       @extend .wcfFontSmall;
                        
                        &:not(:last-child) {
                                margin-right: 10px;

diff --git a/wcfsetup/install/files/style/ui/button.scss b/wcfsetup/install/files/style/ui/button.scss
index a03c005dd25facff0d2407a7c54cdc745bc2b847..94fadf771ed391f7ecb88e365ebcd889e4c19b20 100644 (file)
--- a/wcfsetup/install/files/style/ui/button.scss
+++ b/wcfsetup/install/files/style/ui/button.scss
@@ -27,8 +27,9 @@ input[type="submit"],
        }
        
        &.small {
-               font-size: .85rem;
                padding: 4px 7px;
+               
+               @extend .wcfFontSmall;
        }
 }
 
@@ -90,8 +91,9 @@ input[type="submit"],
        @extend .inlineList;
        
        &.smallButtons .button {
-               font-size: .85rem;
                padding: 4px 7px;
+               
+               @extend .wcfFontSmall;
        }
        
        /* members list */

diff --git a/wcfsetup/install/files/style/ui/dialog.scss b/wcfsetup/install/files/style/ui/dialog.scss
index e159f8fc086928f2b159274fedecd21c27c3646b..d01c32fdde59bf480967c2a664c93dc66ad32f26 100644 (file)
--- a/wcfsetup/install/files/style/ui/dialog.scss
+++ b/wcfsetup/install/files/style/ui/dialog.scss
@@ -74,7 +74,7 @@
                > span {
                        flex: 1 auto;
                        
-                       @extend .wcfFontLarge;
+                       @extend .wcfFontHeadline;
                }
                
                > a {

diff --git a/wcfsetup/install/files/style/ui/dropdown.scss b/wcfsetup/install/files/style/ui/dropdown.scss
index 1cb7964e90a415e1b230f3805ccda682e862c46b..76e47fbe1e1823148b362480db91c715962f55bc 100644 (file)
--- a/wcfsetup/install/files/style/ui/dropdown.scss
+++ b/wcfsetup/install/files/style/ui/dropdown.scss
@@ -198,8 +198,9 @@
                }
                
                &.dropdownText {
-                       font-size: $wcfSmallFontSize;
                        padding: $wcfGapTiny $wcfGapMedium;
+                       
+                       @extend .wcfFontSmall;
                }
                
                &.boxFlag {
@@ -277,7 +278,7 @@
                        margin-bottom: 0;
                        
                        > p {
-                               font-size: $wcfSmallFontSize;
+                               @extend .wcfFontSmall;
                        }
                }
        }

diff --git a/wcfsetup/install/files/style/ui/dropdownInteractive.less b/wcfsetup/install/files/style/ui/dropdownInteractive.less
index 70d99921b6beb1049c4b68eb2e137d6a955a7a28..7444d46098592b70b09bb26678ae2cc881da0137 100644 (file)
--- a/wcfsetup/install/files/style/ui/dropdownInteractive.less
+++ b/wcfsetup/install/files/style/ui/dropdownInteractive.less
@@ -99,10 +99,10 @@
        
        &.loading,
        &.noItems {
-               font-family: "Segoe UI Light";
-               font-size: 1.2rem;
                padding: @wcfGapLarge @wcfGapMedium;
                text-align: center;
+               
+               @extend .wcfFontHeadline;
        }
        
        &:not(.loading):not(.noItems) {
@@ -186,8 +186,7 @@
        
        > .box32 > .containerHeadline {
                > h3 {
-                       font-family: "Segoe UI Light";
-                       font-size: 1.2rem;
+                       @extend .wcfFontHeadline
                }
        }
        
@@ -202,7 +201,8 @@
        
        .interactiveDropdownUserMenuLinkList > li {
                display: inline-block;
-               font-size: .85rem;
+       
+               @extend .wcfFontSmall;
                
                &:after {
                        content: " \2013 ";

diff --git a/wcfsetup/install/files/style/ui/message.scss b/wcfsetup/install/files/style/ui/message.scss
index d0a1ae83f86f4c98a7375009f043e335bb3dba7d..67bf07676c5fb10bcf352fdb6cb6b5f140e7e537 100644 (file)
--- a/wcfsetup/install/files/style/ui/message.scss
+++ b/wcfsetup/install/files/style/ui/message.scss
@@ -37,7 +37,7 @@
        }
        
        .dataList {
-               font-size: .85rem;
+               @extend .wcfFontSmall;
        }
 }
 
@@ -83,7 +83,8 @@
        
        .badge {
                color: rgb(255, 255, 255);
-               font-size: .85rem;
+               
+               @extend .wcfFontSmall;
        }
 }
 
@@ -100,13 +101,13 @@
        order: 1;
        
        > h1 {
-               font-family: "Segoe UI Light";
-               font-size: 1.4rem;
                margin-bottom: 5px;
+               
+               @extend .wcfFontHeadline;
        }
        
        > p {
-               font-size: .85rem;
+               @extend .wcfFontSmall;
        }
 }
 
@@ -188,7 +189,7 @@
                
                > h3 {
                        > .messageGroupLink {
-                               font-size: $wcfTitleFontSize;
+                               @extend .wcfFontHeadline;
                        }
                        
                        > .badge.label {
@@ -201,7 +202,7 @@
                }
                
                > nav {
-                       font-size: $wcfSmallFontSize;
+                       @extend .wcfFontSmall;
                        
                        > ul > li {
                                display: inline;
@@ -307,8 +308,7 @@
        
        .messageGroupInfo {
                @extend .inlineList;
-               
-               font-size: $wcfSmallFontSize;
+               @extend .wcfFontSmall;
                
                > li:not(:last-child) {
                        margin-right: 5px;

diff --git a/wcfsetup/install/files/style/ui/tabMenu.scss b/wcfsetup/install/files/style/ui/tabMenu.scss
index 887ec9edab489b7c9463c8b73b668e4415d37dbf..17ef3a303309d4443aea86b4c43b7bbe6a899a3e 100644 (file)
--- a/wcfsetup/install/files/style/ui/tabMenu.scss
+++ b/wcfsetup/install/files/style/ui/tabMenu.scss
@@ -23,7 +23,7 @@
                                display: block;
                                padding: 5px 0;
                                
-                               @extend .wcfFontLarge;
+                               @extend .wcfFontHeadline;
                        }
                }
        }

diff --git a/wcfsetup/install/files/style/ui/tabMenuMessage.scss b/wcfsetup/install/files/style/ui/tabMenuMessage.scss
index e4ac6ce538be949064f2ff7408dbb271b8909d0e..3312e2e9eaab6a1183145405e5eff495bef1a89a 100644 (file)
--- a/wcfsetup/install/files/style/ui/tabMenuMessage.scss
+++ b/wcfsetup/install/files/style/ui/tabMenuMessage.scss
@@ -45,16 +45,11 @@
                                        a {
                                                color: $wcfButtonText;
                                                display: block;
-                                               font-size: $wcfSmallFontSize;
                                                outline: 0;
                                                padding: 0 $wcfGapSmall;
                                                
-                                               -webkit-touch-callout: none;
-                                               -webkit-user-select: none;
-                                               -khtml-user-select: none;
-                                               -moz-user-select: none;
-                                               -ms-user-select: none;
-                                               user-select: none;
+                                               @extend .userSelectNone;
+                                               @extend .wcfFontSmall;
                                                
                                                &:hover {
                                                        color: $wcfButtonTextActive;

diff --git a/wcfsetup/install/files/style/ui/tabularBox.scss b/wcfsetup/install/files/style/ui/tabularBox.scss
index 175aa710fc1759e23e81b8f4a13cb220297916e2..00417847a3e40b5792db9d6d82c07313a631d3d9 100644 (file)
--- a/wcfsetup/install/files/style/ui/tabularBox.scss
+++ b/wcfsetup/install/files/style/ui/tabularBox.scss
@@ -22,7 +22,7 @@
                                                color: $wcfContentTabularLink;
                                                display: block;
                                                
-                                               @extend .wcfFontLarge;
+                                               @extend .wcfFontHeadline;
                                        }
                                        
                                        &.ASC > a,
@@ -89,7 +89,7 @@
                > h1,
                > h2,
                > h3 {
-                       @extend .wcfFontLarge;
+                       @extend .wcfFontHeadline;
                }
                
                a,
@@ -138,7 +138,7 @@ div.tabularBoxTitle > header {
                text-align: left;
                white-space: nowrap;
                
-               @extend .wcfFontLarge;
+               @extend .wcfFontHeadline;
                
                > a {
                        color: $wcfTabularBoxHeadline;
@@ -216,16 +216,19 @@ div.tabularBoxTitle > header {
                }
                
                &.columnDate {
-                       font-size: .85rem;
                        text-align: right;
                        width: 1px;
                        white-space: nowrap;
                        word-wrap: normal;
+                       
+                       @extend .wcfFontSmall;
                }
                
                &.columnURL, &.columnSmallText {
-                       font-size: .85rem;
                        text-align: left;
+                       
+                       @extend .wcfFontSmall;
+                       
                }
        }
        

diff --git a/wcfsetup/install/files/style/ui/tooltip.scss b/wcfsetup/install/files/style/ui/tooltip.scss
index 69b84fde1a7662ab5821dfe35979b36dbd18bc61..f284e1b5e6f7449b44527b080ef88ff37d636037 100644 (file)
--- a/wcfsetup/install/files/style/ui/tooltip.scss
+++ b/wcfsetup/install/files/style/ui/tooltip.scss
@@ -2,17 +2,17 @@
        background-color: $wcfTooltipBackgroundColor;
        border-radius: 6px;
        color: $wcfTooltipColor;
-       font-size: $wcfSmallFontSize;
        max-width: 300px;
        opacity: 0;
        padding: 5px 10px 7px;
        pointer-events: none;
        position: absolute;
        top: 0;
+       transition: visibility 0s linear .2s, opacity .2s linear .2s;
        visibility: hidden;
        z-index: 800;
        
-       transition: visibility 0s linear .2s, opacity .2s linear .2s;
+       @extend .wcfFontSmall;
        
        > .elementPointer {
                border-color: $wcfTooltipBackgroundColor transparent;

diff --git a/wcfsetup/install/files/style/ui/userProfile.scss b/wcfsetup/install/files/style/ui/userProfile.scss
index d27c2d5248eeb667c8d84fae5b400bd1162f15b3..d2c0f54ac68cb1fe734383f46c6086e8b140f701 100644 (file)
--- a/wcfsetup/install/files/style/ui/userProfile.scss
+++ b/wcfsetup/install/files/style/ui/userProfile.scss
@@ -66,7 +66,8 @@
                
                > .userActivity > span {
                        display: block;
-                       font-size: .85rem;
+                       
+                       @extend .wcfFontSmall;
                }
        }
 }
@@ -81,9 +82,10 @@
                        }
                        
                        > a {
-                               font-size: 1.4rem;
                                padding: 0;
                                text-transform: uppercase;
+                               
+                               @extend .wcfFontHeadline;
                        }
                }
                
@@ -110,5 +112,5 @@
 }
 
 .username {
-       font-size: 1.2rem;
+       @extend .wcfFontHeadline;
 }