diff --git a/CHANGELOG.md b/CHANGELOG.md index 925177a35..131a675df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,50 @@ # CHANGELOG +*1.2.0* (2018-08-27) + - ⚠️ breaking markup changes + - **Organisms** : + - **[footer light:](https://epfl-idevelop.github.io/elements/#/organisms/footer)** margin improvement + - **[Contact & variants](https://epfl-idevelop.github.io/elements/#/organisms/contact):** Add schema attributes and refactor default background + - **Content-type** : + - **[science question:](https://epfl-idevelop.github.io/elements/#/content-types/science-question)** New design + - **[bachelor project](https://epfl-idevelop.github.io/elements/#/content-types/bachelor-project):** refactor bachelor-project content-type + - **[event & variants](https://epfl-idevelop.github.io/elements/#/content-types/event):** Add schema attributes + - **[news & variants](https://epfl-idevelop.github.io/elements/#/content-types/news):** Add schema attributes + - **Pages** : + - **[Association homepage](https://epfl-idevelop.github.io/elements/#/pages/association-homepage):** Update footer for the light variant + - **[Blog homepage](https://epfl-idevelop.github.io/elements/#/pages/blog-homepage):** Update footer for the light variant + - **[Event detail page](https://epfl-idevelop.github.io/elements/#/pages/event-detail):** Overhaul of the header and the content + - **[Event homepage](https://epfl-idevelop.github.io/elements/#/pages/event-homepage):** Update footer for the light variant + - **[Faculties page](https://epfl-idevelop.github.io/elements/#/pages/facultes):** Update the side navigation content + - **[Lab homepage](https://epfl-idevelop.github.io/elements/#/pages/lab-homepage):** Update the usage of the contact organism + - **[News detail page](https://epfl-idevelop.github.io/elements/#/pages/news-detail):** Add schema attributes + - **[News homepage](https://epfl-idevelop.github.io/elements/#/pages/news-homepage):** Update pagination wrapper + - **[People list page](https://epfl-idevelop.github.io/elements/#/pages/people-list):** Update the header and breadcrumb + + - ✨ New implementations + - add function for async loading toggle + - add better release documentation and process + - **Atoms** : + - add **[loader](https://epfl-idevelop.github.io/elements/#/atoms/loader)** and [browse button async state](https://epfl-idevelop.github.io/elements/#/atoms/nav-toggle) + - **Molecules** : + - **[Key number](https://epfl-idevelop.github.io/elements/#/molecules/key-number)** + - **Organisms** : + - **[Key numbers group](https://epfl-idevelop.github.io/elements/#/organisms/key-number-group)** + - **Content-types** : + - **[Study plan](https://epfl-idevelop.github.io/elements/#/content-types/study-plan)** content type + - **Pages** : + - add **[about](https://epfl-idevelop.github.io/elements/#/pages/about)** page + - add **[education](https://epfl-idevelop.github.io/elements/#/pages/education)** page + - add **[innovation](https://epfl-idevelop.github.io/elements/#/pages/innovation)** page + + - 🛠 Fixes & other + - error messages cleaning + - fix missing round option on social-icon variant + - add default profile picture for people details page #182 + - fix IE grid issue with minmax and sizes + - centralise z-index management. cleanup dead code + *1.1.2* (2018-08-20) - Add documentation new structure - Add branding pages diff --git a/README.md b/README.md index 101584c3d..9d78e40d9 100644 --- a/README.md +++ b/README.md @@ -44,12 +44,46 @@ With Docker, you can run: - `$ docker-compose up builder` same as `$ yarn build` but in containers - `$ docker-compose up server` same as `$ yarn start` but in containers -## Publish +## Create a new release + +#### 1. Git release + +This project follows the [git-flow](https://danielkummer.github.io/git-flow-cheatsheet/)'s guidelines. It means you must use the following command to start a new release from your local **`dev`** branch : + +```bash +$ git flow release start x.x.x +``` + +#### 2. Changelog & versions + +Because a new release can impact a lot of projects who use *Element*, **you must precisely list\* all the updates made on the components markup** in the **`CHANGELOG.md`**. + +**Check previous versions to give you an idea of how to write it the right way* + +Then, don't forget to **update the version number** in the `VERSION` and the `package.json` files. + +Commit everything ! + +#### 3. Complete the release + +First, you must complete the [git-flow](https://danielkummer.github.io/git-flow-cheatsheet/) release process with the following command : + +```bash +$ git flow release finish -p 'x.x.x' +``` + +Because the previous command will normally push your release commits and tag, simply **go on Github\* and copy/paste the release's changelog content** in the release's description. (go directly using `https://github.com/epfl-idevelop/elements/releases/edit/x.x.x`) + +#### 4. Publish the builds + +Complete every commit and tag message if needed. Then put yourself in your local **`master`** branch and type the following command to **start the build publishing task** : + +```bash +$ sh publish.sh x.x.x +``` + +That's it ! If everything went fine, **the new release's build is available on the `dist/frontend`** branch thanks to you ! -1. From your local `dev` branch, `$ git flow release start x.x.x` -2. Update `VERSION`, `CHANGELOG.md` and package.json `version` -3. `$ git flow release finish -p 'x.x.x'` -4. From your local `master` branch, `$ sh publish.sh x.x.x` ## Contribute diff --git a/VERSION b/VERSION index 45a1b3f44..26aaba0e8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.2 +1.2.0 diff --git a/assets/components/atoms/loader/loader.scss b/assets/components/atoms/loader/loader.scss new file mode 100644 index 000000000..41ce58b57 --- /dev/null +++ b/assets/components/atoms/loader/loader.scss @@ -0,0 +1,16 @@ +@charset 'utf-8'; + +@keyframes rotation { + from { transform: rotate(0deg); } + to { transform: rotate(360deg); } +} + +.loader { + display: inline-block; + width: 0.9rem; + height: 0.9rem; + border: 3px solid gray('200'); + border-right-color: gray('600'); + border-radius: 100%; + animation: rotation 1s linear infinite; +} diff --git a/assets/components/atoms/loader/loader.twig b/assets/components/atoms/loader/loader.twig new file mode 100644 index 000000000..f23547956 --- /dev/null +++ b/assets/components/atoms/loader/loader.twig @@ -0,0 +1 @@ + diff --git a/assets/components/atoms/loader/loader.yml b/assets/components/atoms/loader/loader.yml new file mode 100644 index 000000000..406df8b53 --- /dev/null +++ b/assets/components/atoms/loader/loader.yml @@ -0,0 +1,2 @@ +title: Loader +name: loader \ No newline at end of file diff --git a/assets/components/atoms/nav-lang/nav-lang.scss b/assets/components/atoms/nav-lang/nav-lang.scss index fe221dccb..93eea8a90 100644 --- a/assets/components/atoms/nav-lang/nav-lang.scss +++ b/assets/components/atoms/nav-lang/nav-lang.scss @@ -68,7 +68,7 @@ bottom: -$mm-lang-height; width: $mm-lang-width; height: $mm-lang-height; - z-index: 999120; + z-index: $zindex-mobile-lang; background: gray('600'); transition: bottom 0.3s; diff --git a/assets/components/atoms/nav-toggle/nav-toggle-async.twig b/assets/components/atoms/nav-toggle/nav-toggle-async.twig new file mode 100644 index 000000000..82b9eddd3 --- /dev/null +++ b/assets/components/atoms/nav-toggle/nav-toggle-async.twig @@ -0,0 +1,6 @@ + diff --git a/assets/components/atoms/nav-toggle/nav-toggle.scss b/assets/components/atoms/nav-toggle/nav-toggle.scss index f9654959e..41ee57c82 100644 --- a/assets/components/atoms/nav-toggle/nav-toggle.scss +++ b/assets/components/atoms/nav-toggle/nav-toggle.scss @@ -4,20 +4,30 @@ display: none; position: relative; top: 1px; - z-index: 101; + z-index: $zindex-toggle; margin-right: $grid-gutter-width / 3; padding: $spacer / 4 $spacer / 2; &:hover { cursor: pointer; } + .loader { + display: none; + margin-right: 0.2rem; + } + + &.is-loading { + .loader { display: inline-block; } + .icon { display: none !important; } + } + .icon { margin-right: 0.2rem; font-size: 0.7rem; - &:first-child { + &:first-of-type { display: block; } - &:last-child { + &:last-of-type { display: none; } } @@ -32,11 +42,11 @@ } .desktop-menu-open .nav-toggle { - .icon:first-child { + .icon:first-of-type { display: none; } - .icon:last-child { + .icon:last-of-type { display: block; } } diff --git a/assets/components/atoms/nav-toggle/nav-toggle.twig b/assets/components/atoms/nav-toggle/nav-toggle.twig index 94d1f4e25..95b217451 100644 --- a/assets/components/atoms/nav-toggle/nav-toggle.twig +++ b/assets/components/atoms/nav-toggle/nav-toggle.twig @@ -1,4 +1,5 @@