diff --git a/assets/stylesheets/template/base/_variables.scss b/assets/stylesheets/template/base/_variables.scss index bd7ffdf..a07835b 100644 --- a/assets/stylesheets/template/base/_variables.scss +++ b/assets/stylesheets/template/base/_variables.scss @@ -14,197 +14,63 @@ $theme-gray-darker: #242424; $theme-white: #fff; $theme-red: #d20001; $theme-blue: #003d7e; - $theme-color-main: #333333; $theme-color-second: #E4002B; $theme-color-third: #ed4c43; $theme-color-green: #288E8E; - // Font stacks $main-font: "IndustryW00-Medium","Barlow", "Roboto", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif; $sub-font: "Barlow","Roboto", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif; - @font-face {font-family: "IndustryW00-Medium"; src: url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.eot"); src: url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.eot?#iefix") format("embedded-opentype"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.woff2") format("woff2"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.woff") format("woff"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.ttf") format("truetype"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.svg#IndustryW00-Medium") format("svg"); } - // Font sizes $font-15: 0.9375rem; $font-13:1.2rem; - $font-h1: 1.6rem; $font-h2: 1.5rem; $font-h3: 1.2rem; $font-h4: 1.1rem; $font-h5: 1rem; $font-h6: 0.9rem; - // // Modules // -------------------------------------------------- // ## commonly use in all widgets - // Font sizes $w-widget-title-font-size: 1.5rem; - // Colors $w-border-color: $theme-gray-lighter; - // // AD banner Module // -------------------------------------------------- - // Font sizes $w-caption-font-size: 1.2rem; $w-caption-desc: 1rem; - // // Announcement Module // -------------------------------------------------- - // Font sizes $w-title-font-size-small: 0.75rem; $w-subtitle-font-size: 0.75rem; $w-meta-font-size: 0.75rem; - $w-table-th-font-size: 0.75em; $w-table-td-font-size: 0.75em; - $i-title-font-size-large: 2em; - // colors - $link-color: $theme-color-main; $link-hover-color: lighten($theme-color-main, 10%); - $table-th-bgcolor: $theme-color-main; - // // Archive Module // -------------------------------------------------- - // Font sizes $w-item-heading-font-size: 0.85rem; - // // Member Module // -------------------------------------------------- - $border-width: 0.25em; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +.response-content { + justify-self: auto; +} .response-content { justify-self: auto; diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index e25c0b9..91c8f16 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -575,6 +575,8 @@ body{ color: $theme-color-main; font-size: 0.6em; font-family: $main-font; + padding: 0; + height: auto; @media (max-width: $screen-sm) { height: 5em; display: none; @@ -590,40 +592,19 @@ body{ width:100%!important; } @media(min-width:1900px){ - width: 225px; - margin-top: -12px; + width: 330px; } @media screen and (min-width:1025px) and (max-width:1899px){ - width: 181px; - margin-top: -3px; + width: 261px; } @media screen and (min-width:769px) and (max-width:1025px){ - width: 150px; - margin-top: -5px; + width: 200px; } @media screen and (min-width:$screen-xs) and (max-width:769px){ - width: 146px !important; + width: 200px !important; } @media screen and (max-width:$screen-xs){ - width: 110px !important; - margin-top: 3px; - } - - } - .navbar-brand:nth-child(2){ - @media(min-width:1900px){ - width: 330px!important; - margin-top: -14px; - } - @media screen and (min-width:1025px) and (max-width:1899px){ - width: 261px!important; - margin-top: -5px; - } - @media screen and (min-width:769px) and (max-width:1025px){ - width: 200px!important; - } - @media screen and (max-width:768px){ - width: 140px!important; + width: 140px !important; } } .modules-menu .modules-menu-level-0 > li > a{