From 66055cd96af572187495fe5c75fa2a51be438f3d Mon Sep 17 00:00:00 2001 From: Aleksandr Rogozin Date: Fri, 16 Aug 2019 17:23:57 +0300 Subject: [PATCH 1/6] Migration the timeline component to "bootstrap 4". --- build/scss/_mixins.scss | 2 +- build/scss/_timeline.scss | 50 ++- pages/UI/timeline.html | 754 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 777 insertions(+), 29 deletions(-) create mode 100644 pages/UI/timeline.html diff --git a/build/scss/_mixins.scss b/build/scss/_mixins.scss index 95fcd6fb1..fa4bb833b 100644 --- a/build/scss/_mixins.scss +++ b/build/scss/_mixins.scss @@ -267,7 +267,7 @@ // Background Variant @mixin background-variant($name, $color) { .bg-#{$name} { - background-color: #{$color}; + background-color: #{$color} !important; &, > a { diff --git a/build/scss/_timeline.scss b/build/scss/_timeline.scss index e80e81c69..c334a4125 100644 --- a/build/scss/_timeline.scss +++ b/build/scss/_timeline.scss @@ -3,11 +3,9 @@ // .timeline { - list-style: none; - margin: 0 0 30px; + margin: 0 0 45px; padding: 0; position: relative; - // The line &::before { @include border-radius($border-radius); @@ -20,13 +18,17 @@ top: 0; width: 4px; } + // Element + > div { + &::before, + &::after { + content: ""; + display: table; + } - > li { - @include clearfix; margin-bottom: 15px; margin-right: 10px; position: relative; - // The content > .timeline-item { @include box-shadow($card-shadow); @@ -38,7 +40,6 @@ margin-top: 0; padding: 0; position: relative; - // The time and header > .time { color: #999; @@ -46,7 +47,7 @@ font-size: 12px; padding: 10px; } - + // Header > .timeline-header { border-bottom: 1px solid $card-border-color; color: $gray-700; @@ -54,21 +55,30 @@ line-height: 1.1; margin: 0; padding: 10px; - + // Link in header > a { font-weight: 600; } } - // Item body and footer > .timeline-body, > .timeline-footer { padding: 10px; } - } + > .timeline-body { + > img { + margin: 10px; + } + } - // The icons + > .timeline-footer { + > a { + color: $white; + } + } + } + // The icons at line > .fa, > .fas, > .far, @@ -87,12 +97,10 @@ width: 30px; } } - // Time label > .time-label { > span { @include border-radius(4px); - background-color: $white; display: inline-block; font-weight: 600; @@ -100,17 +108,3 @@ } } } - -.timeline-inverse { - > li { - > .timeline-item { - @include box-shadow(none); - background: $gray-100; - border: 1px solid $gray-300; - - > .timeline-header { - border-bottom-color: $gray-300; - } - } - } -} diff --git a/pages/UI/timeline.html b/pages/UI/timeline.html new file mode 100644 index 000000000..87f1b62d0 --- /dev/null +++ b/pages/UI/timeline.html @@ -0,0 +1,754 @@ + + + + + + AdminLTE 3 | Timeline + + + + + + + + + + + +
+ + + + + + + + +
+ +
+
+
+
+

Timeline

+
+
+ +
+
+
+
+ + +
+
+ + +
+
+ +
+ +
+ 10 Feb. 2014 +
+ + +
+ +
+ 12:05 +

Support Team sent you an email

+ +
+ Etsy doostang zoodles disqus groupon greplin oooj voxy zoodles, + weebly ning heekya handango imeem plugg dopplr jibjab, movity + jajah plickers sifteo edmodo ifttt zimbra. Babblely odeo kaboodle + quora plaxo ideeli hulu weebly balihoo... +
+ +
+
+ + +
+ +
+ 5 mins ago +

Sarah Young accepted your friend request

+
+
+ + +
+ +
+ 27 mins ago +

Jay White commented on your post

+
+ Take me to your leader! + Switzerland is small and neutral! + We are more like Germany, ambitious and misunderstood! +
+ +
+
+ + +
+ 3 Jan. 2014 +
+ + +
+ +
+ 2 days ago +

Mina Lee uploaded new photos

+
+ ... + ... + ... + ... + ... +
+
+
+ + +
+ + +
+ 5 days ago + +

Mr. Doe shared a video

+ +
+
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+
+ + +
+ +
+ + +
+
+ Version 3.0.0-beta.2 +
+ Copyright © 2014-2019 AdminLTE.io. All rights + reserved. +
+ + + + +
+ + + + + + + + + + + + + + From acdbe25cfad92fcf238251eebdd32051ccf888e7 Mon Sep 17 00:00:00 2001 From: Aleksandr Rogozin Date: Sat, 17 Aug 2019 01:03:58 +0300 Subject: [PATCH 2/6] Update profile page -> timeline part --- pages/examples/profile.html | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pages/examples/profile.html b/pages/examples/profile.html index 5f76a1665..b7c13448b 100644 --- a/pages/examples/profile.html +++ b/pages/examples/profile.html @@ -810,16 +810,16 @@
-
    +
    -
  • +
    10 Feb. 2014 -
  • +
    -
  • +
    @@ -838,10 +838,10 @@ Delete
    -
  • +
-
  • +
    @@ -850,10 +850,10 @@

    Sarah Young accepted your friend request

    -
  • + -
  • +
    @@ -870,17 +870,17 @@ View comment
    -
  • + -
  • +
    3 Jan. 2014 -
  • + -
  • +
    @@ -895,12 +895,12 @@ ...
    -
  • + -
  • +
    -
  • - + + From 02fe8249195fa9b240bba8cd1aff4672482bdacf Mon Sep 17 00:00:00 2001 From: Aleksandr Rogozin Date: Sat, 17 Aug 2019 12:20:47 +0300 Subject: [PATCH 3/6] Returned timeline-inverse css class. --- build/scss/_timeline.scss | 14 ++++++++++++++ pages/examples/profile.html | 10 +++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/build/scss/_timeline.scss b/build/scss/_timeline.scss index c334a4125..7f0e43437 100644 --- a/build/scss/_timeline.scss +++ b/build/scss/_timeline.scss @@ -108,3 +108,17 @@ } } } + +.timeline-inverse { + > div { + > .timeline-item { + @include box-shadow(none); + background: $gray-100; + border: 1px solid $gray-300; + + > .timeline-header { + border-bottom-color: $gray-300; + } + } + } +} diff --git a/pages/examples/profile.html b/pages/examples/profile.html index b7c13448b..cbe7672c7 100644 --- a/pages/examples/profile.html +++ b/pages/examples/profile.html @@ -810,7 +810,7 @@
    -
    +
    @@ -889,10 +889,10 @@

    Mina Lee uploaded new photos

    - ... - ... - ... - ... + ... + ... + ... + ...
    From d27aa490264a5b9c3edd74b8d320cf2d75028c56 Mon Sep 17 00:00:00 2001 From: Aleksandr Rogozin Date: Wed, 21 Aug 2019 23:58:55 +0300 Subject: [PATCH 4/6] Add a sidebar link across all demo pages --- index.html | 6 ++++++ index2.html | 6 ++++++ index3.html | 6 ++++++ pages/UI/buttons.html | 6 ++++++ pages/UI/general.html | 6 ++++++ pages/UI/icons.html | 6 ++++++ pages/UI/modals.html | 6 ++++++ pages/UI/navbar.html | 6 ++++++ pages/UI/sliders.html | 6 ++++++ pages/calendar.html | 6 ++++++ pages/charts/chartjs.html | 6 ++++++ pages/charts/flot.html | 6 ++++++ pages/charts/inline.html | 6 ++++++ pages/examples/404.html | 6 ++++++ pages/examples/500.html | 6 ++++++ pages/examples/blank.html | 6 ++++++ pages/examples/contacts.html | 6 ++++++ pages/examples/e_commerce.html | 6 ++++++ pages/examples/invoice.html | 6 ++++++ pages/examples/language-menu.html | 6 ++++++ pages/examples/legacy-user-menu.html | 6 ++++++ pages/examples/profile.html | 6 ++++++ pages/examples/project_add.html | 6 ++++++ pages/examples/project_detail.html | 6 ++++++ pages/examples/project_edit.html | 6 ++++++ pages/examples/projects.html | 6 ++++++ pages/forms/advanced.html | 6 ++++++ pages/forms/editors.html | 6 ++++++ pages/forms/general.html | 6 ++++++ pages/layout/boxed.html | 6 ++++++ pages/layout/collapsed-sidebar.html | 6 ++++++ pages/layout/fixed-footer.html | 6 ++++++ pages/layout/fixed-sidebar.html | 6 ++++++ pages/layout/fixed-topnav.html | 6 ++++++ pages/mailbox/compose.html | 6 ++++++ pages/mailbox/mailbox.html | 6 ++++++ pages/mailbox/read-mail.html | 6 ++++++ pages/tables/data.html | 6 ++++++ pages/tables/jsgrid.html | 6 ++++++ pages/tables/simple.html | 6 ++++++ pages/widgets.html | 6 ++++++ 41 files changed, 246 insertions(+) diff --git a/index.html b/index.html index 4bb41c1b9..6e31e786a 100644 --- a/index.html +++ b/index.html @@ -339,6 +339,12 @@

    Navbar & Tabs

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +