diff --git a/app/components/nav/sidebar.hbs b/app/components/nav/sidebar.hbs index 552b34a6f411d1d278b8efb99f47c87ced6e5888..c3cc6ad8a61dd1fa844942ca58825d6e0df2bda5 100644 --- a/app/components/nav/sidebar.hbs +++ b/app/components/nav/sidebar.hbs @@ -1,4 +1,4 @@ -<div class="d-flex flex-column flex-shrink-0 p-3 text-white bg-dark" style="width: 280px;"> +<div class="d-flex flex-column flex-shrink-0 p-3 text-white bg-dark sidebar-open" > <a href="/" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-white text-decoration-none"> <svg class="bi me-2" width="40" height="32"><use xlink:href="#bootstrap"></use></svg> <span class="fs-4">Papermerge</span> diff --git a/app/components/tag/new.js b/app/components/tag/new.js index 40dcca044c64547eceda1849a62bac2152dc872e..ca448885ef9a089c088bd235f76199be567fb043 100644 --- a/app/components/tag/new.js +++ b/app/components/tag/new.js @@ -3,15 +3,14 @@ import { action } from '@ember/object'; import { tracked } from '@glimmer/tracking'; import { inject as service } from '@ember/service'; - const COLORS = [ - "#ff0000", - "#0000ff", - "#006684", - "#661200", - "#ce5c00", - "#5c3566", - "#4e9a06" + '#ff0000', + '#0000ff', + '#006684', + '#661200', + '#ce5c00', + '#5c3566', + '#4e9a06' ] function _random_color() { diff --git a/app/models/tag.js b/app/models/tag.js index 86cb9a64fc4e87ed7414217e03d8beb6e58fc3b2..353b9aab25fa6b9e3a16e58ab822c6c1d6c8aee0 100644 --- a/app/models/tag.js +++ b/app/models/tag.js @@ -1,6 +1,7 @@ import { attr } from '@ember-data/model'; import NodeModel from './node'; + export default class TagModel extends NodeModel { @attr name; @attr fg_color; diff --git a/app/styles/app.scss b/app/styles/app.scss index 9eca56cf76922f560b7db005230b49957a0ffbd2..380177da6ed0d17d480e57c1cc7f70dca34b1c41 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -1,6 +1,7 @@ @import "node_modules/bootstrap/scss/bootstrap"; @import "./tag"; @import "./button"; +@import "./nav/sidebar"; main { diff --git a/app/styles/nav/sidebar.scss b/app/styles/nav/sidebar.scss new file mode 100644 index 0000000000000000000000000000000000000000..83f0dd7d68e35660c228efa22984902e8030d517 --- /dev/null +++ b/app/styles/nav/sidebar.scss @@ -0,0 +1,3 @@ +.sidebar-open { + width: 280px; +} \ No newline at end of file