Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ubc-web-services/Megatron
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ubc-web-services/Megatron
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 25 files changed
  • 4 contributors

Commits on Jan 5, 2018

  1. Configuration menu
    Copy the full SHA
    9ec768d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    af25edf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5f549b0 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2018

  1. Add .editorconfig file

    occupant committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    7d818d1 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. Add sticky option to the main navigation menu (#54)

    * add sticky option related changes
    
    * apply debouncing scroll events
    Alice authored and occupant committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    81e4c6e View commit details
    Browse the repository at this point in the history
  2. Add dependecies for postcss and autoprefixer (#55)

    * add dependecies for postcss and autoprefixer
    
    * Tweak npm script to work without npx on the end CSS
    Alice authored and occupant committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    9480a50 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    08382b5 View commit details
    Browse the repository at this point in the history
  4. Add an off drawer canvas region for slide-in menu bar (#51)

    * Develop (#49)
    
    * Fix whitespace in theme-settings.php
    
    * Fix whitespace in template.php
    
    * Fix for class generation in #33
    
    * Initial commit
    
    * Add Drawer region; Drawer is now working
    
    * Add sticky navigation option; sticky option is now working
    
    * Control loading JS, CSS files when drawer option is disabled/enabled
    
    * Rename drawer button; fix conditionals on page.tpl.php
    
    * Remove inactive options
    
    * Give default value to clf_navigation_placement
    
    * Use Drupal behaviors to JS
    
    * Fix namespace conflict
    
    * Fix overflow issue; add drawer slide-in trigger to hamburger button
    
    * Replaced the rendered $drawer_nav template variable with the new drawer region rendering.
    
    But the contents of $drawer_nav into a renderable array instead of the rendered string
    and stored it in the region.
    
    Replaced $containerstart/$containerend with a div and added attributes to it instead of
    possible duplicate wrapper divs since we are adding a new one anyways.
    
    * Make the region printing the primary menu optional
    
    * Change arrow direction&color; adjust arrow theme in drawer region
    
    * Remove unnecessary important keywords & in-line styles;
    
    * Add BEM class; adjust line-height of drawer button
    
    * remove unncessary params & args in js file
    
    * move adding sticky option to a separate PR
    
    * remove sticky option related CSS/JS files
    
    * make the labels clearer
    
    * replace navigation_placement to drawer_region
    
    * add less source file
    
    * adjust wording on theme appearance form
    Alice authored and occupant committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    0c72d00 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2019

  1. Update megatron.info

    occupant committed Jun 16, 2019
    Configuration menu
    Copy the full SHA
    90b4d90 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2019

  1. Convert Less to SCSS

    occupant committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    1caea99 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f69198a View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2020

  1. Update template.php

    occupant committed Jun 18, 2020
    Configuration menu
    Copy the full SHA
    b1ca609 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2021

  1. Configuration menu
    Copy the full SHA
    a0adf4d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b70e4fe View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2022

  1. Fix bug with breadcrumb notice with latest panels_breadcrumb module: …

    …Notice: Undefined offset: 1 in megatron_breadcrumb
    joelpittet committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    7709c38 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1d65d15 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d69cd47 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2022

  1. Configuration menu
    Copy the full SHA
    e36beaf View commit details
    Browse the repository at this point in the history
Loading