From a19f515d05d46e9a66659f3ab4f44af757e23ead Mon Sep 17 00:00:00 2001 From: Gilberto Medrano Date: Tue, 23 Sep 2014 20:41:58 -0700 Subject: [PATCH 1/3] created a grid for action items --- apps/st2-actions/template.html | 18 ++++++++++++++++++ less/style.less | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/apps/st2-actions/template.html b/apps/st2-actions/template.html index b7b9d6ae9..a70b21f28 100644 --- a/apps/st2-actions/template.html +++ b/apps/st2-actions/template.html @@ -1,6 +1,24 @@
+ + + + + + + + + + + + + + + + + +
Machine NameHuman-friendly NameDescriptionStatus
{{ action.name }}{{ action.runner_type }}{{ action.description }}{{ action.enabled }}
  • Date: Tue, 23 Sep 2014 20:41:58 -0700 Subject: [PATCH 2/3] created a grid for action items --- apps/st2-actions/template.html | 18 ++++++++++++++++++ less/style.less | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/apps/st2-actions/template.html b/apps/st2-actions/template.html index b7b9d6ae9..a70b21f28 100644 --- a/apps/st2-actions/template.html +++ b/apps/st2-actions/template.html @@ -1,6 +1,24 @@
    + + + + + + + + + + + + + + + + + +
    Machine NameHuman-friendly NameDescriptionStatus
    {{ action.name }}{{ action.runner_type }}{{ action.description }}{{ action.enabled }}
    • Date: Wed, 24 Sep 2014 00:21:48 -0700 Subject: [PATCH 3/3] added markup and styles to Actions grid to match static prototype --- apps/st2-actions/style.less | 45 +++++++++++++++++++++++++++++++- apps/st2-actions/template.html | 47 ++++++++++++++++++++-------------- index.html | 1 + less/style.less | 1 + 4 files changed, 74 insertions(+), 20 deletions(-) diff --git a/apps/st2-actions/style.less b/apps/st2-actions/style.less index fa38a5c25..f34295bd0 100644 --- a/apps/st2-actions/style.less +++ b/apps/st2-actions/style.less @@ -58,7 +58,50 @@ position: relative; flex: 1; - + + .panel-default { + border: none; + border-radius: 0; + } + + .panel-heading { + background: #666; + border-bottom: 1px solid #999; + h2 { + color: white; + font-size: 15px; + text-transform: uppercase; + font-weight: 200; + font-family: Oswald; + } + } + + .panel-body { + padding: 0; + } + + .panel, .panel-heading, .panel-body, .table { + border: none; + border-radius: 0; + box-shadow: none; + margin: 0; + + th { + border-bottom: none; + } + .odd { + background-color: #E9E9EC; + } + .even { + background-color: transparent; + } + .table-hover > tbody > tr:hover > td, + .table-hover > tbody > tr:hover > th { + background-color: #428bca; + color: white; + } + } + &__list { margin: 0; padding: 0; diff --git a/apps/st2-actions/template.html b/apps/st2-actions/template.html index a70b21f28..4d070099e 100644 --- a/apps/st2-actions/template.html +++ b/apps/st2-actions/template.html @@ -1,31 +1,40 @@
      -
      - - - - - - - - - - - - - - - - - -
      Machine NameHuman-friendly NameDescriptionStatus
      {{ action.name }}{{ action.runner_type }}{{ action.description }}{{ action.enabled }}
      +
      +
      +

      Category One

      +
      + +
      + + + + + + + + + + + + + + + + + + +
      Machine NameHuman-friendly NameDescriptionStatus
      {{ action.name }}{{ action.runner_type }}{{ action.description }}{{ action.enabled }}
      +
      +
      diff --git a/index.html b/index.html index 729e1f72a..9b0238878 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ + diff --git a/less/style.less b/less/style.less index 821edb220..b18704eca 100644 --- a/less/style.less +++ b/less/style.less @@ -7,6 +7,7 @@ @import "layout"; @import "colors"; @import "/components/bootstrap/less/tables.less"; +@import "/components/bootstrap/less/panels.less"; html, body { height: 100%;