diff --git a/public/css/2018.css b/public/css/2018.css index d34afb4..f7195eb 100644 --- a/public/css/2018.css +++ b/public/css/2018.css @@ -69,14 +69,13 @@ body { color: #191919; display: flex; margin: 3px; + padding: 2px 5px; + float: none; font-size: 16px; font-weight: 500; line-height: 1.92857; height: 28px; } -.Redesign .smallnavbarbutton:hover { - background: transparent; -} #alert, #success { top: 40px; @@ -165,10 +164,6 @@ body { background-position: -28px -475px; } -.navbarbuttoncontainer li:hover { - background: none; - } - .smallnavbarbutton:nth-child(6):before { content: ''; background-image: url(https://images.rbxcdn.com/f4000b6d03a0df7153556d2514045629-navigation_10022018.svg); @@ -203,7 +198,7 @@ body { margin: 0; width: 100%; } -.subbar { +.mySubmenuFixed.Redesign { top: 0; height: 0; width: 0; @@ -290,7 +285,7 @@ body { width: 30px; height: 30px; } -#logo_full img { +#logo_full .btn-logo { padding: 5px 0; max-width: 120px; height: 30px; @@ -308,12 +303,16 @@ body { height: 30px; float: left; } +.btn-logo:hover, .smallnavbarbutton:hover, .navbarbuttoncontainer li:hover { + background-image: none; + background: none; +} #NavigationRedesignBannerContainer p { color: #fff; } -#logo_full, #logo_full img { +#logo_full, #logo_full .btn-logo { height: 30px; } @@ -537,7 +536,7 @@ iframe { #smallnav_open { display: none; } - .subbar { + .mySubmenuFixed { display: block; } #logo_full img, #logo_full { diff --git a/public/css/app.css b/public/css/app.css index 40ab950..b0686f3 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -77,10 +77,6 @@ text-align: center; } -.navbarbuttoncontainer li:hover { - background: linear-gradient(180deg, rgb(255,255,255,.3), transparent); -} - #alert { background: linear-gradient(#f07575 10%, #de2323 100%); } @@ -101,7 +97,7 @@ display: inline-block; float: left; } -#logo_full, #logo_full img { +#logo_full, #logo_full .btn-logo { width: 200px; Height: 35px; } @@ -177,7 +173,7 @@ .BannerRedesign { height: 35px; background: #114081; - background: linear-gradient(#1951A5 0%, #114081); + background-image: url(/images/RevisedHeader/bg-rbx_header.png); border-bottom: 1px solid #0A2246; position: fixed; width: 100%; @@ -185,13 +181,31 @@ top: 0; display: inline-flex; } -.subbar { - display: block; - height: 25px; - width: 100%; - top: 36px; +.btn-logo:hover, .navbarbuttoncontainer li:hover { + background-image: url(/images/RevisedHeader/bg-main_menu_hover.png); + background-size: auto 35px; +} +.smallnavbarbutton:hover { + background-image: url(/images/RevisedHeader/bg-sub_menu_hover.png); +} +div.mySubmenuFixed { position: fixed; + top: 68px; + width: 100%; + z-index: 10000; +} +div.mySubmenuFixed { + top: 36px; background: linear-gradient(#000 10%, #191919 100%); + height: 25px; +} +.mySubmenuFixed.Redesign { + position: fixed; + top: 35px; +} +.mySubmenuFixed.Redesign { + position: fixed; + top: 35px; } .subMenu { background: #A3514F; @@ -248,6 +262,38 @@ align-items: center; } +#HeaderSignUp { + font-family: Arial; + font-weight: bold; + color: #fff; + font-size: 13px; + top: -8px; + position: relative; + *top: -6px; +} +#HeaderOr { + font-family: Arial; + font-weight: normal; + color: #9Ec3E7; + font-size: 13px; + top: -8px; + *top: -6px; + position: relative; + margin: 0 6px; +} +#headerLogin { + color: white; + background: url(/images/btn-login_dropdown.png) no-repeat; + display: inline-block; + height: 27px; + width: 62px; + position: relative; + cursor: pointer; +} +#headerLogin:hover { + background-position: 0 -54px; +} + iframe { width: 100%; height: 2000px; @@ -390,7 +436,7 @@ iframe { position: relative; } #navbarlogincontainer { - margin-top: 9px; + margin-top: 5px; float: right; position: relative; } @@ -416,10 +462,7 @@ iframe { .Redesign .smallnavbarbutton { font-size: 12px; padding: 5px; - line-height: 26px; -} -.Redesign .smallnavbarbutton:hover { - background: linear-gradient(0deg,#191919 10%, #474747 100%); + float: left; } .invisible, @@ -493,8 +536,13 @@ body { /* Fallback for IE 11*/ background-color: rgb(255, 255, 255); } -.content_signup a[href="https://discord.gg/nudzQ7hkWY"]{ +.content_signup .hyperlink{ display: block; + color: #0074bd; + transition: .25s all ease-in-out; +} +.content_signup .hyperlink:hover { + color: #32cfff; } .content_signup h1, .content_signup a, .content_signup p { text-align: center; diff --git a/public/css/classicapp.css b/public/css/classicapp.css index d6ea744..148c53d 100644 --- a/public/css/classicapp.css +++ b/public/css/classicapp.css @@ -40,9 +40,10 @@ html { Height: 40px; } -.navbarbuttoncontainer li:hover, .Redesign .smallnavbarbutton:hover { +.btn-logo:hover, .smallnavbarbutton:hover, .navbarbuttoncontainer li:hover { + background-image: none; background: none; - } +} .BannerRedesign { height: 40px; @@ -112,6 +113,13 @@ html { padding-right: 5px; text-align: center; font-size: 15px; + line-height: 25px; + float: none; +} +.mySubmenuFixed.Redesign { + background: none; + height: 29px; + top: 44px; } @media (min-width: 1688px) { diff --git a/public/css/classicappdark.css b/public/css/classicappdark.css index c3ff77d..6ce4aed 100644 --- a/public/css/classicappdark.css +++ b/public/css/classicappdark.css @@ -40,9 +40,10 @@ html { Height: 40px; } -.navbarbuttoncontainer li:hover, .Redesign .smallnavbarbutton:hover { +.btn-logo:hover, .smallnavbarbutton:hover, .navbarbuttoncontainer li:hover { + background-image: none; background: none; - } +} .BannerRedesign { height: 40px; @@ -112,6 +113,13 @@ html { padding-right: 5px; text-align: center; font-size: 15px; + line-height: 25px; + float: none; +} +.mySubmenuFixed.Redesign { + background: none; + height: 29px; + top: 44px; } @media (min-width: 1688px) { diff --git a/public/images/RevisedHeader/bg-main_menu_hover.png b/public/images/RevisedHeader/bg-main_menu_hover.png new file mode 100644 index 0000000..f929193 Binary files /dev/null and b/public/images/RevisedHeader/bg-main_menu_hover.png differ diff --git a/public/images/RevisedHeader/bg-rbx_header.png b/public/images/RevisedHeader/bg-rbx_header.png new file mode 100644 index 0000000..bdd1348 Binary files /dev/null and b/public/images/RevisedHeader/bg-rbx_header.png differ diff --git a/public/images/RevisedHeader/bg-sub_menu_hover.png b/public/images/RevisedHeader/bg-sub_menu_hover.png new file mode 100644 index 0000000..fc4c1d7 Binary files /dev/null and b/public/images/RevisedHeader/bg-sub_menu_hover.png differ diff --git a/public/images/btn-login_dropdown.png b/public/images/btn-login_dropdown.png new file mode 100644 index 0000000..35c3028 Binary files /dev/null and b/public/images/btn-login_dropdown.png differ diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 33fb7f1..7bdb8bf 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -14,5 +14,5 @@

Sign Up or Login


-Join our Discord! +Join our Discord! @endsection \ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index f4836a7..69e6378 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -89,14 +89,14 @@
- -
+
Friends @if (!Auth::guest() && count(Auth::user()->getFriendRequests()))