From 9fa75a8b45d8b4a1520b2f247bfb15230f4e2dae Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 10 Sep 2013 15:02:03 -0400 Subject: [PATCH 01/18] init - cerulean theme --- .gitignore | 1 + public/css/nodebb.less | 2 +- public/themes/cerulean/account.less | 1 + public/themes/cerulean/admin.less | 1 + public/themes/cerulean/category.less | 1 + public/themes/cerulean/cerulean.less | 13 +++++++++++++ public/themes/cerulean/footer.less | 1 + public/themes/cerulean/header.less | 1 + public/themes/cerulean/home.less | 1 + public/themes/cerulean/noscript.less | 2 ++ public/themes/cerulean/search.less | 1 + public/themes/cerulean/style.less | 2 ++ public/themes/cerulean/topic.less | 1 + public/themes/cerulean/unread.less | 1 + public/themes/cerulean/users.less | 1 + 15 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 public/themes/cerulean/account.less create mode 100644 public/themes/cerulean/admin.less create mode 100644 public/themes/cerulean/category.less create mode 100644 public/themes/cerulean/cerulean.less create mode 100644 public/themes/cerulean/footer.less create mode 100644 public/themes/cerulean/header.less create mode 100644 public/themes/cerulean/home.less create mode 100644 public/themes/cerulean/noscript.less create mode 100644 public/themes/cerulean/search.less create mode 100644 public/themes/cerulean/style.less create mode 100644 public/themes/cerulean/topic.less create mode 100644 public/themes/cerulean/unread.less create mode 100644 public/themes/cerulean/users.less diff --git a/.gitignore b/.gitignore index e83f2413b2..8f0138635b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ public/config.json public/css/*.css public/themes/* !/public/themes/vanilla +!/public/themes/cerulean *.sublime-project *.sublime-workspace plugins/* diff --git a/public/css/nodebb.less b/public/css/nodebb.less index 2b29bad852..cb51c9496a 100644 --- a/public/css/nodebb.less +++ b/public/css/nodebb.less @@ -1 +1 @@ -@import "../themes/vanilla/vanilla.less"; \ No newline at end of file +@import "../themes/cerulean/cerulean.less"; \ No newline at end of file diff --git a/public/themes/cerulean/account.less b/public/themes/cerulean/account.less new file mode 100644 index 0000000000..2f790a1df6 --- /dev/null +++ b/public/themes/cerulean/account.less @@ -0,0 +1 @@ +@import "../vanilla/account"; \ No newline at end of file diff --git a/public/themes/cerulean/admin.less b/public/themes/cerulean/admin.less new file mode 100644 index 0000000000..8875e632b2 --- /dev/null +++ b/public/themes/cerulean/admin.less @@ -0,0 +1 @@ +@import "../vanilla/admin"; \ No newline at end of file diff --git a/public/themes/cerulean/category.less b/public/themes/cerulean/category.less new file mode 100644 index 0000000000..6bc84f94a0 --- /dev/null +++ b/public/themes/cerulean/category.less @@ -0,0 +1 @@ +@import "../vanilla/category"; \ No newline at end of file diff --git a/public/themes/cerulean/cerulean.less b/public/themes/cerulean/cerulean.less new file mode 100644 index 0000000000..16ffbdb38a --- /dev/null +++ b/public/themes/cerulean/cerulean.less @@ -0,0 +1,13 @@ +@import "../vanilla/mixins"; +@import "style"; +@import "topic"; +@import "category"; +@import "noscript"; +@import "home"; +@import "header"; +@import "account"; +@import "search"; +@import "unread"; +@import "admin"; +@import "users"; +@import "footer"; \ No newline at end of file diff --git a/public/themes/cerulean/footer.less b/public/themes/cerulean/footer.less new file mode 100644 index 0000000000..3695671f81 --- /dev/null +++ b/public/themes/cerulean/footer.less @@ -0,0 +1 @@ +@import "../vanilla/footer"; \ No newline at end of file diff --git a/public/themes/cerulean/header.less b/public/themes/cerulean/header.less new file mode 100644 index 0000000000..8dcb99ce42 --- /dev/null +++ b/public/themes/cerulean/header.less @@ -0,0 +1 @@ +@import "../vanilla/header"; \ No newline at end of file diff --git a/public/themes/cerulean/home.less b/public/themes/cerulean/home.less new file mode 100644 index 0000000000..67bb5c1cb8 --- /dev/null +++ b/public/themes/cerulean/home.less @@ -0,0 +1 @@ +@import "../vanilla/home"; \ No newline at end of file diff --git a/public/themes/cerulean/noscript.less b/public/themes/cerulean/noscript.less new file mode 100644 index 0000000000..3ff06767f5 --- /dev/null +++ b/public/themes/cerulean/noscript.less @@ -0,0 +1,2 @@ +@import "../vanilla/noscript"; +@import "../vanilla/mixins"; \ No newline at end of file diff --git a/public/themes/cerulean/search.less b/public/themes/cerulean/search.less new file mode 100644 index 0000000000..eb794b248e --- /dev/null +++ b/public/themes/cerulean/search.less @@ -0,0 +1 @@ +@import "../vanilla/search"; \ No newline at end of file diff --git a/public/themes/cerulean/style.less b/public/themes/cerulean/style.less new file mode 100644 index 0000000000..e4588c6eef --- /dev/null +++ b/public/themes/cerulean/style.less @@ -0,0 +1,2 @@ +@import "../vanilla/style"; +@import "../vanilla/mixins"; \ No newline at end of file diff --git a/public/themes/cerulean/topic.less b/public/themes/cerulean/topic.less new file mode 100644 index 0000000000..0526338896 --- /dev/null +++ b/public/themes/cerulean/topic.less @@ -0,0 +1 @@ +@import "../vanilla/topic"; \ No newline at end of file diff --git a/public/themes/cerulean/unread.less b/public/themes/cerulean/unread.less new file mode 100644 index 0000000000..81fb4bcde7 --- /dev/null +++ b/public/themes/cerulean/unread.less @@ -0,0 +1 @@ +@import "../vanilla/unread"; \ No newline at end of file diff --git a/public/themes/cerulean/users.less b/public/themes/cerulean/users.less new file mode 100644 index 0000000000..36736bfccb --- /dev/null +++ b/public/themes/cerulean/users.less @@ -0,0 +1 @@ +@import "../vanilla/users"; \ No newline at end of file From 392b80fe149ea71db8693d0603b01d8f1a65c752 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 10 Sep 2013 15:10:51 -0400 Subject: [PATCH 02/18] home.less --- public/templates/home.tpl | 2 +- public/themes/cerulean/home.less | 13 ++++++++++++- public/themes/cerulean/noscript.less | 3 +-- public/themes/cerulean/style.less | 3 +-- public/themes/vanilla/home.less | 28 ++++++++++++++++++++-------- 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/public/templates/home.tpl b/public/templates/home.tpl index 5ba19691e9..2720a9cba8 100644 --- a/public/templates/home.tpl +++ b/public/templates/home.tpl @@ -2,7 +2,7 @@ {motd} -
+
diff --git a/public/themes/cerulean/home.less b/public/themes/cerulean/home.less index 67bb5c1cb8..9455fbcc28 100644 --- a/public/themes/cerulean/home.less +++ b/public/themes/cerulean/home.less @@ -1 +1,12 @@ -@import "../vanilla/home"; \ No newline at end of file +@import "../vanilla/home"; + + +.home { + h4 { + color: #555; + } + + .icon { + border-radius: 5px; + } +} \ No newline at end of file diff --git a/public/themes/cerulean/noscript.less b/public/themes/cerulean/noscript.less index 3ff06767f5..6ffd2e0da5 100644 --- a/public/themes/cerulean/noscript.less +++ b/public/themes/cerulean/noscript.less @@ -1,2 +1 @@ -@import "../vanilla/noscript"; -@import "../vanilla/mixins"; \ No newline at end of file +@import "../vanilla/noscript"; \ No newline at end of file diff --git a/public/themes/cerulean/style.less b/public/themes/cerulean/style.less index e4588c6eef..f50e77d92d 100644 --- a/public/themes/cerulean/style.less +++ b/public/themes/cerulean/style.less @@ -1,2 +1 @@ -@import "../vanilla/style"; -@import "../vanilla/mixins"; \ No newline at end of file +@import "../vanilla/style"; \ No newline at end of file diff --git a/public/themes/vanilla/home.less b/public/themes/vanilla/home.less index 14d80e6782..cd6e514171 100644 --- a/public/themes/vanilla/home.less +++ b/public/themes/vanilla/home.less @@ -1,33 +1,45 @@ -.categories { +.home { padding-top: 10px; h4 { font-weight: 700; + line-height: 20px; text-align: left; - /*color: #555;*/ // NOTE: color for cat/topic header links should be grey in the default theme when we get around to it. white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } - a { - text-decoration: none; - border: 0; - } + .icon { width: 100%; height: 110px; text-align: center; - border-radius: 0px; margin: 0; padding-top:25px; .pointer; margin-bottom: 20px; - border-radius: 5px; overflow:hidden; } } + + + + + + + + + + + + + + + + +// TODO EVERYTHING BELOW: Please Remove! -- colors & animations should not go here .category-purple { @color: #ab1290; background: @color; From de8d6d3c8cdf06daf84b96b0060426088adc7191 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 10 Sep 2013 15:13:59 -0400 Subject: [PATCH 03/18] category, removing deprecated thread-rating --- public/templates/category.tpl | 6 ------ public/themes/vanilla/category.less | 21 --------------------- 2 files changed, 27 deletions(-) diff --git a/public/templates/category.tpl b/public/templates/category.tpl index 81af0c5b93..a3e39de1b6 100644 --- a/public/templates/category.tpl +++ b/public/templates/category.tpl @@ -31,12 +31,6 @@
  • -
    diff --git a/public/themes/vanilla/category.less b/public/themes/vanilla/category.less index 6a660ff29d..b9f7c2b78f 100644 --- a/public/themes/vanilla/category.less +++ b/public/themes/vanilla/category.less @@ -10,7 +10,6 @@ a { li { list-style: none; - //border-bottom: 1px solid #eee; padding-bottom: 10px; &.deleted { @@ -28,26 +27,6 @@ margin-left: -25px; } - .thread-rating { - color: #444; - text-align: center; - margin-top: 7px; - - span { - display: inline-block; margin-left: 5px; - i { - padding-left: 2.4px; - } - - - @media (max-width: 1200px) - { - margin-left: -1px; - } - } - - - } .topic-row { From ac4803961a7cd883e7aacf7c74772f7e1bab307a Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 10 Sep 2013 15:50:21 -0400 Subject: [PATCH 04/18] topic cleanup and begin cerulean port --- public/src/forum/topic.js | 6 +- public/templates/topic.tpl | 357 +++++++++++++++--------------- public/themes/cerulean/topic.less | 43 +++- public/themes/vanilla/topic.less | 236 +++++++------------- 4 files changed, 308 insertions(+), 334 deletions(-) diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index 399a03cc25..144620790b 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -624,9 +624,9 @@ }); } - jQuery('.post-author-info').css('bottom', '0px'); - postAuthorImage = postAuthorImage || document.getElementById('post-author-image'); - postAuthorInfo = postAuthorInfo || document.getElementById('post-author-info'); + jQuery('.mobile-author-info').css('bottom', '0px'); + postAuthorImage = postAuthorImage || document.getElementById('mobile-author-image'); + postAuthorInfo = postAuthorInfo || document.getElementById('mobile-author-info'); pagination = pagination || document.getElementById('pagination'); pagination.parentNode.style.display = 'block'; diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index b2cf94910b..a450405fa6 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -1,202 +1,201 @@ -
      -
    1. - -
      2. -
    2. - -
      3. -
    3. - {topic_name} -
      4. - -
    - -
      - - -
    • -
      -
      -
      - -
      -       -

      -

      {topic_name}

      -

      - -
      -
      - - -
      - -
      - - -
      -
      - - -
      - -
      - - +
      +
        +
      1. + +
        2. +
      2. + +
        3. +
      3. + {topic_name} +
        4. + +
      + +
      -
      • - - - - -
    • - -
      -
      -
      -
      -
      - - - -
      - -
      - -
      -
      - - -
      - -
      - - +
      • + + + + +
    • + +
      +
      +
      +
      +
      + + + +
      + +
      + +
      +
      + + +
      + +
      + + +
      +
      -
      -
      - -
      {posts.content}
      -
      - - {posts.uploadedImages.name}
      - -
      -
      {posts.signature}
      -
      - - posted {posts.relativeTime} ago - | last edited by {posts.editorname} {posts.relativeEditTime} ago - -
      +
      {posts.content}
      +
      + + {posts.uploadedImages.name}
      + +
      +
      {posts.signature}
      +
      + + posted {posts.relativeTime} ago + | last edited by {posts.editorname} {posts.relativeEditTime} ago + +
      +
      -
    -
    • - - -
    - -
    -
    -
    - - -
    + + + +
    + +
    -
    -
    -
    - -
    -
    -

    +
    + +
    + +
    -
    - -