Skip to content

Instantly share code, notes, and snippets.

View jamiejohnsonkc's full-sized avatar

Jamie Johnson jamiejohnsonkc

View GitHub Profile
@jamiejohnsonkc
jamiejohnsonkc / local by flywheel offscreen
Created December 22, 2018 03:41
local by flywheel app offscreen window fix
del "%AppData%\Local by Flywheel\window-state.json"
@jamiejohnsonkc
jamiejohnsonkc / css
Created January 1, 2019 18:05
basic structure for bootstrap carousel
html,
body {
height: 100%;
}
.carousel,
.item,
.active {
height: 100%;
}
@jamiejohnsonkc
jamiejohnsonkc / git
Last active February 23, 2019 15:39
git merge two repos with conflicting repos
--in original repo "a"
git remote add -f b "path/to/repo_b.git" [use github clone url for path]
git remote update
git diff master remotes/b/master
[resolve any merge conflicts - see related gist]
git merge -S --allow-unrelated-histories old-project/master
git remote rm b
@jamiejohnsonkc
jamiejohnsonkc / git resolve merge conflict
Last active February 23, 2019 15:26
Git esolving merge conflicts
To resolve a merge conflict caused by competing line changes, you must choose which changes to incorporate from the different branches in a new commit.
For example, if you and another person both edited the file styleguide.md on the same lines in different branches of the same Git repository, you'll get a merge conflict error when you try to merge these branches. You must resolve this merge conflict with a new commit before you can merge these branches.
Open Git Bash.
Navigate into the local Git repository that has the merge conflict.
cd REPOSITORY-NAME
Generate a list of the files affected by the merge conflict. In this example, the file styleguide.md has a merge conflict.
@jamiejohnsonkc
jamiejohnsonkc / Chrome Remote Debugging from Windows 10 to Android
Created March 10, 2019 04:05
Chrome Remote Debugging from Windows 10 to Android
My Windows 10 wouldn't recognize my phone. After using adb it now works. Here's how.
Connect your Android phone via USB
When it asks what to connect as, choose "Camera (PTP)"
Open Google Chrome and the webpage you want to test
Open Chrome Developer Tools and find the "Remote Devices" tab
Now, your phone might or might not appear in this tab.
@jamiejohnsonkc
jamiejohnsonkc / sass
Last active June 5, 2019 14:57
Compensate for the Bootstrap fixed top navigation bar. #scss #css #bootstrap #navbar #splash
// Compensate for the Bootstrap fixed top navigation bar.
//
// No styleguide reference.
body {
padding-top: @navbar-height;
}
// Offset fixed top navigation bar if WordPress admin bar is
// visible.
@jamiejohnsonkc
jamiejohnsonkc / crop marks css
Last active April 5, 2019 02:58
css crop marks
//reversed over black background
.summary__page-title_container{
z-index: 1;
position: relative;
display: block
}
.page__title.summary__page_title{
position: absolute;
@jamiejohnsonkc
jamiejohnsonkc / html comment regex search
Created May 25, 2019 03:39
regex remove html comments
@jamiejohnsonkc
jamiejohnsonkc / scss
Last active May 29, 2019 21:23
safari prevent phone number color change #css #safari #ios
//* prevent change of telephone color while enabling phone number detection
a[href^=tel] {
text-decoration:inherit;
color: inherit;
} {
}
@jamiejohnsonkc
jamiejohnsonkc / safari disable phone detection.html
Created May 29, 2019 21:26
safari disable phone detection #safari #phone #phone-detection #fix
<!-- 1. Stop Safari from detecting and enabling phone number links with the following meta tag -->
<meta name=”format-detection” content=”telephone=no”>