diff --git a/README.md b/README.md index a60caa88..de19dab1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# UnboundEd Learning Content Management System (LCMS) +# LearningTapestry Learning Content Management System (LCMS) [ ![Codeship Status for learningtapestry/unbounded-lcms](https://app.codeship.com/projects/87ed3f00-ddc7-0135-b08f-3e0bdd3c602e/status?branch=master)](https://app.codeship.com/projects/266015) [![Maintainability](https://api.codeclimate.com/v1/badges/9c9dce0cf0aa36698a9c/maintainability)](https://codeclimate.com/github/learningtapestry/unbounded-lcms/maintainability) @@ -6,7 +6,7 @@ [![Join the chat at https://gitter.im/learningtapestry/unbounded-lcms](https://badges.gitter.im/learningtapestry/unbounded-lcms.svg)](https://gitter.im/learningtapestry/unbounded-lcms?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -The UnboundEd LCMS is a specialized content management system for high quality +The LCMS is a specialized content management system for high quality education materials. It incorporates two primary web-based components; an end-user interface to allow educators and other consumers to browse, search, and export educational materials available through the site, and an administrative interface that allows users with permissions to import content into the site from a variety of sources and manage the existing content library. ## Setup @@ -20,4 +20,4 @@ email, or any other method with the owners of this repository before proposing a Before submitting a pull request please verify that all tests pass. Be sure to describe the intent of your change and reference the related github issue in your description. ## License -UnboundEd LCMS is released as open source under the [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0.html). +LCMS is released as open source under the [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0.html). diff --git a/app/assets/javascripts/components/helpers/FreshdeskBtn.js.jsx b/app/assets/javascripts/components/helpers/FreshdeskBtn.js.jsx index 57d92e03..fd38fdf8 100644 --- a/app/assets/javascripts/components/helpers/FreshdeskBtn.js.jsx +++ b/app/assets/javascripts/components/helpers/FreshdeskBtn.js.jsx @@ -5,5 +5,5 @@ function FreshdeskBtn(props) { }; // return {props.text} - return {props.text} + return {props.text} } diff --git a/app/assets/stylesheets/layout/_connect.scss b/app/assets/stylesheets/layout/_connect.scss deleted file mode 100644 index ae979506..00000000 --- a/app/assets/stylesheets/layout/_connect.scss +++ /dev/null @@ -1,61 +0,0 @@ -.o-connect { - @include flex-grid-column(12, 0); - color: $ub-nav-link; - flex-direction: column; - padding-bottom: $ub-xlarge-padding; - padding-top: $ub-xlarge-padding; - - @include breakpoint(medium) { - @include flex-grid-column(4, 0); - } - - @include breakpoint(medium only) { - } - - @include e(button) { - padding-bottom: .2rem; - padding-right: .2rem; - } - - @include e(buttons) { - @include flex; - flex-wrap: wrap; - } - - @include e(dsc) { - @include txt-element(connect-text); - margin-bottom: 1.5rem; - padding-right: $ub-base-padding; - } - - @include e(list) { - @include menu-simple; - margin: 0; - li { margin-right: .75rem; } - i { font-size: 2.3rem; } - a { - color: $ub-nav-link; - - &:hover { - color: scale-color($ub-nav-link, $lightness: -20%); - } - } - } - - @include e(hr) { - border: 1px solid $ub-nav-link; - margin: 0; - opacity: .5; - width: 100%; - - @include breakpoint(medium) { - display: none; - } - } - - h2 { - @include txt-element(connect-header); - margin-bottom: 0; - text-transform: uppercase; - } -} diff --git a/app/assets/stylesheets/layout/_footer.scss b/app/assets/stylesheets/layout/_footer.scss index 166053c3..06fab9d4 100644 --- a/app/assets/stylesheets/layout/_footer.scss +++ b/app/assets/stylesheets/layout/_footer.scss @@ -95,6 +95,14 @@ $footer-breakpoint-down: ipad; img { width: $logo-width; } } + @include e(brand) { + color: $ub-white; + font-size: 1.5em; + font-style: $ub-serif; + font-weight: bolder; + } + + @include e(item) { @include flex-grid-column(12, 0); color: darken($ub-nav-link, 20%); diff --git a/app/assets/stylesheets/layout/_header.scss b/app/assets/stylesheets/layout/_header.scss index 5ee3e935..e60c2dea 100644 --- a/app/assets/stylesheets/layout/_header.scss +++ b/app/assets/stylesheets/layout/_header.scss @@ -198,6 +198,13 @@ } } + @include e(brand) { + color: $ub-white; + font-size: 2em; + font-style: $ub-serif; + font-weight: bolder; + } + @include m(documents) { background-color: rgba($ub-primary, .9); min-height: $ub-nav-height; diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 636b54b0..f5537403 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -75,8 +75,7 @@ 'layout/sticky-header', 'layout/sticky-navigation', 'layout/page', - 'layout/subscribe', - 'layout/connect'; + 'layout/subscribe'; @import 'pages/home', diff --git a/app/models/page.rb b/app/models/page.rb index 7c5c6d9d..52acd3d3 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -4,6 +4,6 @@ class Page < ActiveRecord::Base validates :body, :title, :slug, presence: true def full_title - "UnboundEd - #{title}" + "LCMS - #{title}" end end diff --git a/app/presenters/content_guide_presenter.rb b/app/presenters/content_guide_presenter.rb index c870265d..112bd373 100644 --- a/app/presenters/content_guide_presenter.rb +++ b/app/presenters/content_guide_presenter.rb @@ -26,7 +26,7 @@ def self.ccss_standards end def sticky_title - "#{t('ui.unbounded')} #{subject} #{t('ui.guide')} #{grades.range}" + "LCMS #{subject} #{t('ui.guide')} #{grades.range}" end def broken_images diff --git a/app/presenters/document_presenter.rb b/app/presenters/document_presenter.rb index 40c5dad0..c63ae9f3 100644 --- a/app/presenters/document_presenter.rb +++ b/app/presenters/document_presenter.rb @@ -96,7 +96,7 @@ def math_practice end def pdf_header - "UnboundEd / #{full_breadcrumb}" + "LCMS / #{full_breadcrumb}" end def pdf_filename diff --git a/app/views/admin/shared/_header.html.erb b/app/views/admin/shared/_header.html.erb index 18d9143e..52883e62 100644 --- a/app/views/admin/shared/_header.html.erb +++ b/app/views/admin/shared/_header.html.erb @@ -3,7 +3,7 @@