From b240ae3b4437c35bde70773b2ff4d0b690388570 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 06:14:49 +0200 Subject: [PATCH 1/5] Add css for changes in user's profile --- resources/assets/sass/custom.scss | 46 +++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index e84a5dac5..dd208eb05 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -105,3 +105,49 @@ body, button, input, textarea { .notification-page .list-group-item:first-child { border-top: none; } + +.nav-topbar { + border-top: 1px solid $gray-300; +} +.nav-topbar .nav-item { + margin: -1px 1.5rem 0; +} +.nav-topbar .nav-link { + border: 1px solid transparent; + color: $gray-300; + padding: 0.75rem 0; +} +.nav-topbar .nav-link:focus, .nav-topbar .nav-link:hover { + border-top-color: $gray-300; +} +.nav-topbar .nav-link.disabled { + color: $gray-300; + background-color: transparent; + border-color: transparent; +} +.nav-topbar .nav-item.show .nav-link, .nav-topbar .nav-link.active { + color: $gray-600; + border-top-color: $gray-600; +} +.nav-topbar .dropdown-menu { + margin-top:-1px; +} + +.info-overlay { + position: relative; +} + +.info-overlay .info-overlay-text { + display: none; + position: absolute; +} + +.info-overlay:hover .info-overlay-text { + display: flex; +} + +.info-overlay-text { + width: 100%; + height: 100%; + background-color: rgba(0,0,0,0.5); +} From 3550c0b94c284eaf1958f157d149d9bdc68a4294 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 06:22:43 +0200 Subject: [PATCH 2/5] Add lower weight option --- resources/assets/sass/custom.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index dd208eb05..a145f48dd 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -151,3 +151,7 @@ body, button, input, textarea { height: 100%; background-color: rgba(0,0,0,0.5); } + +.font-weight-ultralight { + font-weight: 200 !important; +} From 2c190ba934e918a212dadeb1f76ee9514e166c27 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 06:25:12 +0200 Subject: [PATCH 3/5] Use new classes from stylesheet --- resources/views/profile/show.blade.php | 28 ++++++++++++++++---------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index bb6d57a65..f81e96dbb 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -4,19 +4,19 @@
-
-
-
+
+
+
-
+
- {{$user->username}} + {{$user->username}} @if($owner == true) - - Settings + + @elseif ($following == true) @@ -80,8 +80,8 @@
@if($owner == true)
-
-@endsection \ No newline at end of file +@endsection From 1b12cc2295680b970abaa69b6c1fb6a5864b3d8c Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 06:32:19 +0200 Subject: [PATCH 4/5] Replicate improvements from show --- resources/views/profile/followers.blade.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/profile/followers.blade.php b/resources/views/profile/followers.blade.php index 58e79a3b4..75ff0e939 100644 --- a/resources/views/profile/followers.blade.php +++ b/resources/views/profile/followers.blade.php @@ -4,16 +4,16 @@
-
-
-
+
+
+
-
+
-
- {{$profile->username}} +
+ {{$profile->username}}
From 2d008ea2eecd340a8f76ffb261194512971d48f5 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 2 Jun 2018 06:33:15 +0200 Subject: [PATCH 5/5] Replicate improvements from show --- resources/views/profile/following.blade.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/profile/following.blade.php b/resources/views/profile/following.blade.php index f04ca85e4..27aae9eca 100644 --- a/resources/views/profile/following.blade.php +++ b/resources/views/profile/following.blade.php @@ -4,16 +4,16 @@
-
-
-
+
+
+
-
+
- {{$profile->username}} + {{$profile->username}}